From 887bf34f49879964ae9614cef6ecd0f94c222cae Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 1 Mar 2024 23:44:17 +0800
Subject: [PATCH 1/3] glibc: Make the command enumerating timed out tests
 remap="test"

So if a test times out, it will be noted in jhalfs log.

Also remove "-l" so the output will be something like

    ./nptl/tst-thread-affinity-pthread: Timed out ...

instead of just a puzzling "./nptl/tst-thread-affinity-pthread".
---
 chapter08/glibc.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 39923c03b..6d1be66ae 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -171,9 +171,7 @@ esac</userinput></screen>
         relatively slow and/or running the test suite with multiple
         parallel make jobs).  These tests can be identified with:</para>
 
-        <!-- TODO: Using nodump for freeze.  Change it to role="test" after
-             12.1 release so jhalfs can list these in the log.  -->
-        <screen role="nodump"><userinput>grep "Timed out" -l $(find -name \*.out)</userinput></screen>
+        <screen><userinput remap="test">grep "Timed out" $(find -name \*.out)</userinput></screen>
 
         <para>It's possible to re-run a single test with enlarged timeout
         with

From c2d820a7703efd2052e1d59894a913d9491e92a0 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 1 Mar 2024 23:48:58 +0800
Subject: [PATCH 2/3] procps: Run test as tester

---
 chapter08/procps.xml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/chapter08/procps.xml b/chapter08/procps.xml
index 3f229c713..b592f75c2 100644
--- a/chapter08/procps.xml
+++ b/chapter08/procps.xml
@@ -70,22 +70,17 @@
 <screen revision='sysv'><userinput remap="make">make</userinput></screen>
 <screen revision='systemd'><userinput remap="make">make src_w_LDADD='$(LDADD) -lsystemd'</userinput></screen>
 
-    <para> To run the test suite, run:</para>
+    <!-- To editors: "pmap {X,XX} with unreachable process" tests don't work
+         as root.  They may seem to pass due to some Tcl/Expect/DejaGNU
+         internal hazards with some "luck" though.  -->
+    <para>To run the test suite, run:</para>
 
-<screen><userinput remap="test">make -k check</userinput></screen>
+<screen><userinput remap="test">su tester -c "PATH=$PATH make check"</userinput></screen>
 
     <para>One test named
     <literal>ps with output flag bsdtime,cputime,etime,etimes</literal>
     is known to fail if the host kernel is not built with
-    <literal>CONFIG_BSD_PROCESS_ACCT</literal> enabled.
-    <!-- These two tests just do not work as root but they seem to pass
-         in most time due to some internal hazards of Tcl/Expect/DejaGNU
-         framework.  However the failures have been really observed.
-         TODO: run the test suite as tester after the freeze ends.  -->
-    Two tests named
-    <literal>pmap X with unreachable process</literal> and
-    <literal>pmap XX with unreachable process</literal> are known to
-    fail occasionally.</para>
+    <literal>CONFIG_BSD_PROCESS_ACCT</literal> enabled.</para>
 
     <para>Install the package:</para>
 

From 2001f5cd7ef8ff791cedfe61974e9ea343b9bd47 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 2 Mar 2024 00:03:28 +0800
Subject: [PATCH 3/3] coreutils: Redirect stdin for test suite to prevent two
 failures

The tests affected are test-getlogin and test/tty/tty.sh.  We need an
errata for 12.1.
---
 chapter08/coreutils.xml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 94c276360..68ff3b356 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -123,20 +123,18 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
 
 <screen><userinput remap="test">chown -R tester . </userinput></screen>
 
-    <para>Now run the tests:</para>
+    <!-- To editors: in jhalfs the standard input is always piped to "make"
+         so the test failures are not reproducible in jhalfs even if
+         running the build in a PTY.  Don't use jhalfs to test if we can
+         remove < /dev/null.  -->
+    <para>Now run the tests (using <filename>/dev/null</filename> for the
+    standard input, or two tests may be broken if building LFS in a
+    graphical terminal or a session in SSH or GNU Screen etc. because the
+    standard input is connected to a PTY from host distro, and the device
+    node for such a PTY cannot be accessed from the LFS chroot
+    environment):</para>
 
-<screen><userinput remap="test">su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
-
-<!-- Sometimes skipped, but if not it may fail.
-     Please DO NOT remove or comment out this unless we can fully
-     understand it!
-    <para>The test-getlogin test may fail in the LFS chroot environment.</para>
-    20240226: Commented out as it seems the upstream has root-caused and
-    fixed the issue.  I've checked the fix is in Coreutils 9.4 release
-    tarball:
-
-    https://lists.gnu.org/archive/html/bug-gnulib/2022-06/msg00079.html
--->
+<screen><userinput remap="test">su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check" &lt; /dev/null</userinput></screen>
 
     <para>Remove the temporary group:</para>