Making the chapter 6 tests more obviously optional.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3234 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

21 files changed, 53 insertions, 121 deletions

diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index beba644f8..08e8ea51e 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -23,15 +23,9 @@ can automatically configure source code.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which performs a number of
-checks to ensure it will function correctly. It's worth noting that Autoconf
-does not play a critical role in the overall operation of an LFS system. In
-addition, the Autoconf test suite runs for quite a long period of time.
-Accordingly, the running of the test suite here is not crucial. Should you
-choose to run the Autoconf test suite, the following command will do
-so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.This takes a long time, about 2 SBUs,
+and is strictly optional.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 963374e57..d023313e0 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -24,15 +24,9 @@ with Autoconf.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which performs a number of 
-checks to ensure it will function correctly. It's worth noting that Automake
-does not play a critical role in the overall operation of an LFS system. In 
-addition, the Automake test suite runs for quite a long period of time. 
-Accordingly, the running of the test suite here is not crucial. Should you 
-choose to run the Automake test suite, the following command will do 
-so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>. This takes a long time, about 4 SBUs,
+and is strictly optional.</para>
 
 <para>Install the package:</para>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index f7862db68..f0c2e1b57 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -29,11 +29,8 @@ patch:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make tests</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make tests</userinput>.</para>
 
 <para>Install the package:</para>
 
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 543ec859c..a8404ec27 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -28,11 +28,8 @@ the patch is backported from CVS:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so (and takes a long time):</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index f5b848ea4..4c5bdf129 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -41,14 +41,13 @@ provided by Net-tools. Prevent its installation by applying a patch:</para>
 <screen><userinput>make</userinput></screen>
 
 <para>The <command>su</command> program from Coreutils wasn't installed in
-Chapter 5 because it needed <emphasis>root</emphasis> privilege to do so. We're
-going to need it in a few moments for the test suite. Therefore we work around
-the problem by installing it now:</para>
+<xref linkend="chapter-temporary-tools"/> because it needed
+<emphasis>root</emphasis> privilege to do so. We're going to need it in a few
+moments for the test suite. Therefore we install it now:</para>
 
 <screen><userinput>make install-root</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. However, this particular test suite
+<para>The test suite of this package
 makes some assumptions with regards to the presence of non-root users and
 groups that don't apply this early into the LFS build. We therefore create
 a dummy system user and two dummy groups to allow the tests to run
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index d55d51ae7..81af66eff 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -49,11 +49,8 @@ of.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>Install most of the package:</para>
 
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index 20dae3bb7..e3e14ca15 100644
--- a/chapter06/ed.xml
+++ b/chapter06/ed.xml
@@ -48,11 +48,8 @@ the programs available there is useful in the event of the
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>Install the package:</para>
 
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 8f7e5d6a2..85874e356 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -30,11 +30,8 @@ to the above configure options.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 11683221d..8bfbbb999 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -24,11 +24,8 @@ recognize patterns in text.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make bigcheck</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make bigcheck</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 015902faf..50454c7aa 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -23,11 +23,8 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index dad1b2d2c..018d53476 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -25,15 +25,9 @@ localization. These allow programs to be compiled with Native Language Support
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which performs a number of
-checks to ensure it will function correctly. It's worth noting that Gettext
-does not play a critical role in the overall operation of an LFS system. In
-addition, the Gettext test suite runs for quite a long period of time.
-Accordingly, the running of the test suite here is not crucial. Should you
-choose to run the Gettext test suite, the following command will do
-so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>. This takes a very long time, around
+6 SBUs.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index c7084cbd5..c3754edb0 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -23,11 +23,8 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 9d0beeb89..b38b28c82 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -25,11 +25,8 @@ interface.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 0aa1a6d8f..d990a91e5 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -23,11 +23,8 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/make.xml b/chapter06/make.xml
index ec24bf03f..ed3542427 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -23,11 +23,8 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 514b33d62..594d98426 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -36,10 +36,9 @@ program.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, you first
-have to create a basic <filename>/etc/hosts</filename> file, needed by a
-couple of tests to resolve the name <emphasis>localhost</emphasis>:</para>
+<para>If you wish to run the test suite, you first have to create a basic
+<filename>/etc/hosts</filename> file, which is needed by a couple of tests to
+resolve the name <emphasis>localhost</emphasis>:</para>
 
 <screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 84fd15149..705653686 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -23,11 +23,8 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 8d305150b..78f9e3a22 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -24,11 +24,8 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index c2ec61653..f9e8cff54 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -24,11 +24,8 @@ converting Info documents.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly.  Should you choose to run it, the 
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>Install the package:</para>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 7159413f7..fdb2b9d59 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -39,14 +39,11 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which performs a number of
-checks to ensure it will function correctly. However, the Vim test suite will
-output a whole lot of seemingly garbage characters to screen which can
-occasionally wreak havoc with the running terminal. Accordingly, the running of
-the test suite here is optional. Should you choose to run the Vim test suite,
-the following command will do so:</para>
-
-<screen><userinput>make test</userinput></screen>
+<para>To have the results tested, you can issue:
+<userinput>make check</userinput>. However, this test suite outputs a lot of
+seemingly garbage characters to the screen, and this can wreak havoc with the
+settings of the current terminal. Accordingly, the running of the test suite
+here is strictly optional.</para>
 
 <para>And install the package:</para>
 
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 8dc8e7817..23a4efb9e 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -30,10 +30,8 @@ afterwards.</para></note>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. The test suite for Zlib is quick and
-painless so we recommend it be run. The following command will test the shared
-library:</para>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <screen><userinput>make check</userinput></screen>
 
@@ -46,9 +44,8 @@ library:</para>
 ./configure --prefix=/usr
 make</userinput></screen>
 
-<para>The following command will test the static library:</para>
-
-<screen><userinput>make check</userinput></screen>
+<para>To have the results tested, issue:
+<userinput>make check</userinput>.</para>
 
 <para>Install the static library:</para>