Changeset 85ac148


Ignore:
Timestamp:
03/03/2021 09:48:02 PM (7 months ago)
Author:
Pierre Labastie <pieere@…>
Branches:
11.0, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
5d2965c
Parents:
cbb6df66
Message:

Remove some dependencies on python2, and use a new method for running tests
in btrfs-progs

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@24332 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
postlfs
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • postlfs/filesystems/btrfs-progs.xml

    rcbb6df66 r85ac148  
    1010  <!ENTITY btrfs-progs-size          "2.1 MB">
    1111  <!ENTITY btrfs-progs-buildsize     "92 MB (add 2.7 GB for tests)">
    12   <!ENTITY btrfs-progs-time          "0.3 SBU (add 45 SBU for tests)">
     12  <!ENTITY btrfs-progs-time          "0.2 SBU (add 45-90 SBU for tests, depending on disk speed)">
    1313]>
    1414
     
    8686    <bridgehead renderas="sect4">Optional</bridgehead>
    8787    <para role="optional">
    88       <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests),
    89       <xref linkend="python2"/> (python bindings), and
     88      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests) and
    9089      <xref linkend="reiserfs"/> (for tests)
    9190    </para>
     
    109108    <note>
    110109      <para>
    111         CONFIG_BTRFS_FS_POSIX_ACL and
    112         CONFIG_REISERFS_FS_XATTR are required for some tests.
     110        CONFIG_BTRFS_FS_POSIX_ACL,
     111        CONFIG_REISERFS_FS_XATTR, and
     112        CONFIG_REISERFS_FS_POSIX_ACL are required for some tests.
    113113        Other Btrfs options in the kernel are optional.
    114114      </para>
     
    146146      </para>
    147147    </note>
    148 
    149     <para>
    150       Before running tests, build a support program:
    151       <!-- and disable several that fail:-->
    152     </para>
    153 
    154 <screen remap="test"><userinput>make fssum &amp;&amp;
    155 
    156 sed -i '/found/s/^/: #/' tests/convert-tests.sh &amp;&amp;</userinput></screen>
     148<!-- Keeping this for now, but it seems that calling "make test" is
     149     simpler and does the same thing
     150    <para>
     151      Before running tests, build a support program
     152      and disable several that fail:
     153    </para>
     154
     155<screen remap="test"><userinput>make fssum</userinput></screen>
    157156
    158157    <para>
     
    162161
    163162<screen role="root" remap="test"><userinput>pushd tests
    164    ./fsck-tests.sh    <!-- 43 tests  6m14s -->
    165    ./mkfs-tests.sh    <!-- 20 tests  2m48s -->
    166    ./cli-tests.sh     <!-- 12 tests  0m51s -->
    167    ./convert-tests.sh <!-- 16 tests 13m36s -->
    168    ./misc-tests.sh    <!-- 38 tests  3m18s -->
    169    ./fuzz-tests.sh    <!--  8 tests  1m11s -->
     163   ./fsck-tests.sh
     164   ./mkfs-tests.sh
     165   ./cli-tests.sh
     166   ./convert-tests.sh
     167   ./misc-tests.sh
     168   ./fuzz-tests.sh
    170169popd</userinput></screen>
     170-->
     171    <para>
     172      To test the results, run (as the
     173      <systemitem class="username">root</systemitem>):
     174    </para>
     175
     176<screen role="root" remap="test"><userinput>make test</userinput></screen>
     177
     178    <note>
     179      <para>
     180        If the above mentioned kernel options are not enabled, some tests
     181        fail, and prevent all the remaining tests to run, because the test
     182        disk image is not cleanly unmounted.
     183      </para>
     184    </note>
     185
     186    <para>
     187      Two tests fail for unknown reasons in the
     188      <command>test-libbtrfsutil</command> section. Tests take a very long
     189      time, and it may be interesting to run only part of them. Running tests
     190      only in one directory can be done with
     191      <command>make TEST=&lt;DIR&gt; test</command>.
     192    </para>
    171193
    172194    <para>
     
    191213      is needed if the recommended dependencies are not installed.
    192214    </para>
    193 
     215<!-- not anymore in the commands
    194216    <para>
    195217      <command>mv tests/{cli,convert,misc,fuzz}-tests/ ...</command>: Disables
    196218      tests that fail and prevent tests from completing.
    197219    </para>
    198 
     220-->
    199221    <para>
    200222      <command>ln -s ... /usr/lib/libbtrfs.so</command>: Creates a
  • postlfs/security/libpwquality.xml

    rcbb6df66 r85ac148  
    8484      <xref linkend="linux-pam"/>
    8585    </para>
    86 
     86<!-- Do not advertise python 2 since python 3 can be used
    8787    <bridgehead renderas="sect4">Optional</bridgehead>
    8888    <para role="optional">
    8989      <xref linkend="python2"/>
    9090    </para>
    91 
     91-->
    9292    <para condition="html" role="usernotes">User Notes:
    9393      <ulink url="&blfs-wiki;/libpwquality"/>
  • postlfs/security/volume_key.xml

    rcbb6df66 r85ac148  
    8686      <xref linkend="swig"/>
    8787    </para>
    88 
     88<!-- We prevent using Python2, so do not advertise it
    8989    <bridgehead renderas="sect4">Optional</bridgehead>
    9090    <para role="optional">
    9191      <xref linkend="python2"/>
    9292    </para>
    93 
     93-->
    9494    <para condition="html" role="usernotes">User Notes:
    9595      <ulink url="&blfs-wiki;/volume_key"/>
Note: See TracChangeset for help on using the changeset viewer.