aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nichilson <dnicholson@linuxfromscratch.org>2007-08-11 17:00:48 +0000
committerDan Nichilson <dnicholson@linuxfromscratch.org>2007-08-11 17:00:48 +0000
commitb2f6f2443f0132a8b7590818cd440506ef4a3256 (patch)
tree0f7907a5ed461a5bdfd44b79b8bf273e8e9e0d65
parenta44a1c3a1f5be8912c5c402d8fe544a761f7dcb4 (diff)
Change bash stdin test fix to affect only the necessary script
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8309 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter06/bash.xml9
2 files changed, 7 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d4370eb23..3d83eff24 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,12 +36,12 @@
</listitem>
-->
- <!-- replace with real entry -->
<listitem>
<para>2007-08-11</para>
<itemizedlist>
<listitem>
- <para>[dnicholson] - Started 7.0 milestone.</para>
+ <para>[dnicholson] - Changed the Bash testsuite standard input fix
+ to only affect the necessary test script.</para>
</listitem>
</itemizedlist>
</listitem>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 56d077a22..a6a694b86 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -75,16 +75,17 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
<para>To prepare the tests, ensure that the locale
setting from our environment will be used and that the <systemitem
- class="username">nobody</systemitem> user can write to the sources tree:</para>
+ class="username">nobody</systemitem> user can read the standard input
+ device and write to the sources tree:</para>
<screen><userinput>sed -i 's/LANG/LC_ALL/' tests/intl.tests
+sed -i 's@tests@&amp; &lt;/dev/tty@' tests/run-test
chown -Rv nobody ./</userinput></screen>
<para>Now, run the tests as the <systemitem
- class="username">nobody</systemitem> user, ensuring that the standard
- input device is readable:</para>
+ class="username">nobody</systemitem> user:</para>
-<screen><userinput>su-tools nobody -s /bin/bash -c "make tests" &lt;/dev/tty</userinput></screen>
+<screen><userinput>su-tools nobody -s /bin/bash -c "make tests"</userinput></screen>
<para>Install the package:</para>