Changes in postlfs/filesystems/btrfs-progs.xml [34a6571:90025d31]

File:

• postlfs/filesystems/btrfs-progs.xml (modified) (19 diffs)

postlfs/filesystems/btrfs-progs.xml

@@ -7 +7 @@
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "8ca78d6e62179ef177597422e27a58fc">
+  <!ENTITY btrfs-progs-md5sum        "0472036ca5ef729374c673e1d867476e">
   <!ENTITY btrfs-progs-size          "2.1 MB">
-  <!ENTITY btrfs-progs-buildsize     "54 MB (up to 2.7 GB are used during tests)">
-  <!ENTITY btrfs-progs-time          "0.2 SBU (add 5.9 SBU for tests, but will be longer on slow disks)">
+  <!ENTITY btrfs-progs-buildsize     "97 MB (add 2.7 GB for tests)">
+  <!ENTITY btrfs-progs-time          "0.2 SBU (add 6.3 SBU for tests)">
 ]>
 
@@ -17 +17 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34 +35 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85 +86 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests) and
+      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests),
+      <xref linkend="python2"/> (python bindings), and
       <xref linkend="reiserfs"/> (for tests)
     </para>
@@ -105 +107 @@
   &lt;*/M&gt; Btrfs filesystem support [CONFIG_BTRFS_FS]</literal></screen>
 
-    <para>
-      In addition to the above and to the options required for
-      <xref linkend="lvm2"/> and <xref linkend="reiserfs"/>, the following
-      options must be enabled for running tests:
-    </para>
-
-<screen><literal>File systems  ---&gt;
-  [*]   Btrfs POSIX Access Control Lists      [CONFIG_BTRFS_FS_POSIX_ACL]
-  [*]   ReiserFS extended attributes          [CONFIG_REISERFS_FS_XATTR]
-  [*]     ReiserFS POSIX Access Control Lists [CONFIG_REISERFS_FS_POSIX_ACL]</literal></screen>
+    <note>
+      <para>
+        CONFIG_BTRFS_FS_POSIX_ACL and 
+        CONFIG_REISERFS_FS_XATTR are required for some tests.
+        Other Btrfs options in the kernel are optional.
+      </para>
+    </note>
 
     <indexterm zone="btrfs-progs btrfs-progs-kernel">
@@ -130 +129 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --bindir=/bin \
+            --libdir=/lib \
+            --with-pkgconfigdir=/usr/lib/pkgconfig &amp;&amp;
 make</userinput></screen>
 
@@ -140 +142 @@
       </para>
     </note>
-<!-- Keeping this for now, but it seems that calling "make test" is
-     simpler and does the same thing -->
-    <para>
-      Before running tests, build a support program:
-    </para>
-
-<screen remap="test"><userinput>make fssum</userinput></screen>
+
+    <para>
+      Before running tests, build a support program and 
+      disable several that fail:
+    </para>
+
+<screen remap="test"><userinput>make fssum &amp;&amp;
+
+sed -i '/found/s/^/: #/' tests/convert-tests.sh &amp;&amp;
+
+mv tests/convert-tests/010-reiserfs-basic/test.sh{,.broken}               &amp;&amp;
+mv tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh{,.broken} &amp;&amp;
+mv tests/convert-tests/012-reiserfs-large-hole-extent/test.sh{,.broken}   &amp;&amp;
+mv tests/convert-tests/013-reiserfs-common-inode-flags/test.sh{,.broken}  &amp;&amp;
+mv tests/convert-tests/014-reiserfs-tail-handling/test.sh{,.broken}       &amp;&amp;
+mv tests/fuzz-tests/003-multi-check-unmounted/test.sh{,.broken}</userinput></screen> 
 
     <para>
@@ -154 +165 @@
 
 <screen role="root" remap="test"><userinput>pushd tests
-   ./fsck-tests.sh
-   ./mkfs-tests.sh
-   ./cli-tests.sh
-   ./convert-tests.sh
-   ./misc-tests.sh
-   ./fuzz-tests.sh
+   ./fsck-tests.sh    <!-- 43 tests  6m14s -->
+   ./mkfs-tests.sh    <!-- 20 tests  2m48s -->
+   ./cli-tests.sh     <!-- 12 tests  0m51s -->
+   ./convert-tests.sh <!-- 16 tests 13m36s -->
+   ./misc-tests.sh    <!-- 38 tests  3m18s -->
+   ./fuzz-tests.sh    <!--  8 tests  1m11s -->
 popd</userinput></screen>
 
-<!-- Template for failed test removal:
-    <para>
-      To test the results, first disable one test that fails and prevents
-      the other ones to run:
-    </para>
-
-<screen remap="test"><userinput>mv tests/fsck-tests/012-leaf-corruption/test.sh{,.broken}</userinput></screen>
-Substitute your test failure with the one above. 
-    <para>
-      To test the results, run (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root" remap="test"><userinput>make -j1 -k test</userinput></screen>
--->
-    <note>
-      <para>
-        If the above mentioned kernel options are not enabled, some tests
-        fail, and prevent all the remaining tests to run, because the test
-        disk image is not cleanly unmounted.
-      </para>
-    </note>
-<!--
-    <para>
-      Two tests fail for unknown reasons in the
-      <command>test-libbtrfsutil</command> section. Tests take a very long
-      time, and it may be interesting to run only part of them. Running tests
-      only in one directory can be done with
-      <command>make TEST=&lt;DIR&gt; test</command>.
-    </para>
--->
     <para>
       Install the package as the <systemitem
@@ -198 +178 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+
+ln -sfv ../../lib/$(readlink /lib/libbtrfs.so) /usr/lib/libbtrfs.so &amp;&amp;
+ln -sfv ../../lib/$(readlink /lib/libbtrfsutil.so) /usr/lib/libbtrfsutil.so &amp;&amp;
+rm -fv /lib/libbtrfs.{a,so} /lib/libbtrfsutil.{a,so} &amp;&amp;
+mv -v /bin/{mkfs,fsck}.btrfs /sbin</userinput></screen>
 
   </sect2>
@@ -209 +194 @@
       is needed if the recommended dependencies are not installed.
     </para>
-<!-- not anymore in the commands
+
     <para>
       <command>mv tests/{cli,convert,misc,fuzz}-tests/ ...</command>: Disables
@@ -224 +209 @@
       library entries.
     </para>
--->
+
   </sect2>
 
@@ -267 +252 @@
         <listitem>
           <para>
-            is the main interface into btrfs filesystem operations
+            is the main interface into btrfs filesystem operations.
           </para>
           <indexterm zone="btrfs-progs btrfs-prog">
@@ -279 +264 @@
         <listitem>
           <para>
-            converts from an ext2/3/4 or reiserfs filesystem to btrfs
+            converts from an ext2/3/4 filesystem to btrfs.
           </para>
           <indexterm zone="btrfs-progs btrfs-convert">
@@ -291 +276 @@
         <listitem>
           <para>
-            is a filter to find btrfs root
+            is a filter to find btrfs root.
           </para>
           <indexterm zone="btrfs-progs btrfs-find-root">
@@ -303 +288 @@
         <listitem>
           <para>
-            maps btrfs logical extent to physical extent
+            maps btrfs logical extent to physical extent.
           </para>
           <indexterm zone="btrfs-progs btrfs-map-logical">
@@ -315 +300 @@
         <listitem>
           <para>
-            overwrites the primary superblock with a backup copy
+            overwrites the primary superblock with a backup copy.
           </para>
           <indexterm zone="btrfs-progs btrfs-select-super">
@@ -327 +312 @@
         <listitem>
           <para>
-            tunes various filesystem parameters
+            tunes various filesystem parameters.
           </para>
           <indexterm zone="btrfs-progs btrfstune">
@@ -339 +324 @@
         <listitem>
           <para>
-            does nothing, but is present for consistency with fstab
+            does nothing, but is present for consistency with fstab.
           </para>
           <indexterm zone="btrfs-progs fsck.btrfs">
@@ -351 +336 @@
         <listitem>
           <para>
-            creates a btrfs file system
+            creates a btrfs file system.
           </para>
           <indexterm zone="btrfs-progs mkfs.btrfs">