Changeset 1e3c0346


Ignore:
Timestamp:
Nov 18, 2013, 7:04:31 AM (7 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
b2d8061
Parents:
bd60f9e
Message:

Remove SUBDIRS variable from test command and adjust test suite introduction text.

Location:
BOOK/final-system
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/coreutils.xml

    rbd60f9e r1e3c0346  
    5858    <para os="g">The test suite of Coreutils makes several assumptions about the
    5959    presence of system users and groups that are not valid within the minimal
    60     environment that exists at the moment. Therefore, additional items need
    61     to be set up before running the tests. Skip down to <quote>Install the
    62     package</quote> if not running the test suite.</para>
    63 
    64     <para os="h">Create two <systemitem class="groupname">dummy</systemitem> groups
    65     and a <systemitem class="username">dummy</systemitem> user:</para>
    66 
    67 <screen os="i"><userinput>echo "dummy1:x:1000:" &gt;&gt; /etc/group
    68 echo "dummy2:x:1001:dummy" &gt;&gt; /etc/group
    69 echo "dummy:x:1000:1000::/root:/bin/bash" &gt;&gt; /etc/passwd</userinput></screen>
    70 
    71     <para os="j">Now the test suite is ready to be run. First, run
     60    environment that exists at the moment. Therefore, we will reuse the dummy
     61    groups and user created during Util-linux. Skip down to <quote>Install the
     62    package</quote> if not running the test suite and you did not create the
     63    dummy groups and users during Util-linux.</para>
     64
     65   <para os="h">Now the test suite is ready to be run. First, run
    7266    the tests that are meant to be run as user
    7367    <systemitem class="username">root</systemitem>:</para>
    7468
    75 <screen os="k"><userinput>make NON_ROOT_USERNAME=dummy SUBDIRS= check-root</userinput></screen>
    76 
    77     <para os="l">The testsuite will now be run as the
     69<screen os="i"><userinput>make NON_ROOT_USERNAME=dummy</userinput></screen>
     70
     71    <para os="j">The testsuite will now be run as the
    7872    <systemitem class="username">dummy</systemitem> user. Fix the permissions
    7973    for a few files to allow this:</para>
    8074
    81 <screen os="m"><userinput>chown -Rv dummy .</userinput></screen>
    82 
    83     <para os="n">Then run the remainder of the tests as the
     75<screen os="k"><userinput>chown -Rv dummy .</userinput></screen>
     76
     77    <para os="l">Then run the remainder of the tests as the
    8478    <systemitem class="username">dummy</systemitem> user:</para>
    8579
    86 <screen os="o"><userinput>su dummy -s /bin/bash \
     80<screen os="m"><userinput>su dummy -s /bin/bash \
    8781    -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
    8882
    89     <para os="p">When testing is complete, remove the
     83    <para os="n">When testing is complete, remove the
    9084    <systemitem class="username">dummy</systemitem> user and groups:</para>
    9185
    92 <screen os="q"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
    93 
    94     <para os="r">Install the package:</para>
    95 
    96 <screen os="s"><userinput>make install</userinput></screen>
    97 
    98     <para os="t">Move programs to the locations specified by the FHS:</para>
    99 
    100 <screen os="u"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
     86<screen os="o"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
     87
     88    <para os="p">Install the package:</para>
     89
     90<screen os="q"><userinput>make install</userinput></screen>
     91
     92    <para os="r">Move programs to the locations specified by the FHS:</para>
     93
     94<screen os="s"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
    10195mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
    10296mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
    10397mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
    10498
    105     <para os="v">Other Coreutils programs are used by some of the scripts
     99    <para os="t">Other Coreutils programs are used by some of the scripts
    106100    in the CLFS-Bootscripts package. As <filename
    107101    class="directory">/usr</filename> may not be available during the early
    108102    stages of booting, those binaries need to be on the root partition:</para>
    109103
    110 <screen os="w"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
     104<screen os="u"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
    111105mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
    112106ln -svf ../../bin/install /usr/bin</userinput></screen>
  • BOOK/final-system/multilib/coreutils.xml

    rbd60f9e r1e3c0346  
    111111    xpointer="xpointer(//*[@os='u'])"/>
    112112
    113     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    114     href="../common/coreutils.xml"
    115     xpointer="xpointer(//*[@os='v'])"/>
    116 
    117     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    118     href="../common/coreutils.xml"
    119     xpointer="xpointer(//*[@os='w'])"/>
    120 
    121113  </sect2>
    122114
Note: See TracChangeset for help on using the changeset viewer.