From 49144a2331d7eac0ec495190da87bf8378449648 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 2 Jan 2013 18:39:31 +0000
Subject: Upgrade to Coreutils-8.20. Fixes #3215.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10089 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/coreutils.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index ba496de4e..e4ddc79d6 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -41,10 +41,9 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>Fix a bug in a test case:</para>
+    <para>Fix a couple of test failures:</para>
 
-<screen><userinput remap="pre">sed -i -e 's/! isatty/isatty/' \
-       -e '45i\              || errno == ENOENT' gnulib-tests/test-getlogin.c</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-test-patch;</userinput></screen>
 
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch
@@ -88,7 +87,7 @@
     <para>Now the test suite is ready to be run. First, run the tests that are
     meant to be run as user <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
+<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody SUBDIRS= check-root</userinput></screen>
 
     <para>We're going to run the remainder of the tests as the
     <systemitem class="username">nobody</systemitem> user. Certain tests,
@@ -107,7 +106,7 @@
     environment includes /tools/bin.</para>
 
 <screen><userinput remap="test">su nobody -s /bin/bash \
-          -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
+          -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
 
     <para>Remove the temporary group:</para>
 
-- 
cgit v1.2.3-54-g00ecf