From a300a6545e4fc5e7dd06f61c7c7157e656f4d577 Mon Sep 17 00:00:00 2001
From: YellowJacketLinux <anymouseprophet@gmail.com>
Date: Tue, 8 Oct 2024 12:43:22 -0700
Subject: [PATCH] conditional tests

---
 CH8Build/BLFS.01-cracklib.sh  |  2 +-
 CH8Build/CH08.05-bzip2.sh     |  2 +-
 CH8Build/CH08.21-mpc.sh       |  8 +++++---
 CH8Build/CH08.22-attr.sh      |  8 +++++---
 CH8Build/CH08.23-acl.sh       |  2 +-
 CH8Build/CH08.24-libcap.sh    |  8 +++++---
 CH8Build/CH08.25-libxcrypt.sh |  8 +++++---
 CH8Build/CH08.26-shadow.sh    |  2 +-
 CH8Build/CH08.27-gcc.sh       | 13 ++++++++-----
 CH8Build/CH08.28-ncurses.sh   |  2 +-
 CH8Build/CH08.29-sed.sh       |  8 +++++++-
 CH8Build/CH08.30-psmisc.sh    |  8 +++++---
 CH8Build/CH08.31-gettext.sh   |  8 +++++---
 CH8Build/CH08.32-bison.sh     |  8 +++++---
 CH8Build/CH08.33-grep.sh      |  8 +++++---
 CH8Build/CH08.34-bash.sh      |  2 +-
 16 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/CH8Build/BLFS.01-cracklib.sh b/CH8Build/BLFS.01-cracklib.sh
index 08ed09f..e00a07e 100644
--- a/CH8Build/BLFS.01-cracklib.sh
+++ b/CH8Build/BLFS.01-cracklib.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d cracklib-${cracklib_version} ] && rm -rf cracklib-${cracklib_version}
 
diff --git a/CH8Build/CH08.05-bzip2.sh b/CH8Build/CH08.05-bzip2.sh
index 18b8389..c19ad81 100644
--- a/CH8Build/CH08.05-bzip2.sh
+++ b/CH8Build/CH08.05-bzip2.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d bzip2-${bzip2_version} ] && rm -rf bzip2-${bzip2_version}
 
diff --git a/CH8Build/CH08.21-mpc.sh b/CH8Build/CH08.21-mpc.sh
index 7b72a06..ac3f146 100644
--- a/CH8Build/CH08.21-mpc.sh
+++ b/CH8Build/CH08.21-mpc.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d mpc-${mpc_version} ] && rm -rf mpc-${mpc_version}
 
@@ -25,8 +25,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building mpc html"
 fi
 
-echo "running mpc make check"
-make check > ${GLSOURCES}/mpc.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running mpc make check"
+  make check > ${GLSOURCES}/mpc.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.22-attr.sh b/CH8Build/CH08.22-attr.sh
index 23bc97a..5cd5738 100644
--- a/CH8Build/CH08.22-attr.sh
+++ b/CH8Build/CH08.22-attr.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d attr-${attr_version} ] && rm -rf attr-${attr_version}
 
@@ -22,8 +22,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building attr"
 fi
 
-echo "running attr make check"
-make check > ${GLSOURCES}/attr.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running attr make check"
+  make check > ${GLSOURCES}/attr.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.23-acl.sh b/CH8Build/CH08.23-acl.sh
index 3ae0b6a..896f809 100644
--- a/CH8Build/CH08.23-acl.sh
+++ b/CH8Build/CH08.23-acl.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d acl-${acl_version} ] && rm -rf acl-${acl_version}
 
diff --git a/CH8Build/CH08.24-libcap.sh b/CH8Build/CH08.24-libcap.sh
index 8271e49..522b03a 100644
--- a/CH8Build/CH08.24-libcap.sh
+++ b/CH8Build/CH08.24-libcap.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d libcap-${libcap_version} ] && rm -rf libcap-${libcap_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building libcap"
 fi
 
-echo "running libcap make test"
-make test > ${GLSOURCES}/libcap.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running libcap make test"
+  make test > ${GLSOURCES}/libcap.check.log 2>&1
+fi
 
 make prefix=/usr lib=lib install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.25-libxcrypt.sh b/CH8Build/CH08.25-libxcrypt.sh
index 1fe2c7b..54c0a44 100644
--- a/CH8Build/CH08.25-libxcrypt.sh
+++ b/CH8Build/CH08.25-libxcrypt.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d libxcrypt-${libxcrypt_version} ] && rm -rf libxcrypt-${libxcrypt_version}
 
@@ -23,8 +23,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building libxcrypt"
 fi
 
-echo "running libxcrypt make check"
-make check > ${GLSOURCES}/libxcrypt.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running libxcrypt make check"
+  make check > ${GLSOURCES}/libxcrypt.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.26-shadow.sh b/CH8Build/CH08.26-shadow.sh
index c5f9e23..3ac3df3 100644
--- a/CH8Build/CH08.26-shadow.sh
+++ b/CH8Build/CH08.26-shadow.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d shadow-${shadow_version} ] && rm -rf shadow-${shadow_version}
 
diff --git a/CH8Build/CH08.27-gcc.sh b/CH8Build/CH08.27-gcc.sh
index 78284c2..d668d43 100644
--- a/CH8Build/CH08.27-gcc.sh
+++ b/CH8Build/CH08.27-gcc.sh
@@ -45,11 +45,14 @@ sed -e 's/300000/(1|300000)/'     -i ../libgomp/testsuite/libgomp.c-c++-common/p
 sed -e 's/{ target nonpic } //' \
     -e '/GOTPCREL/d'              -i ../gcc/testsuite/gcc.target/i386/fentryname3.c
 
-# takes really REALLY long time...
-#  Uncomment when patient
-#echo "runninh gcc make check"
-#chown -R tester .
-#su tester -c "PATH=$PATH make -k check"
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running gcc make check. This takes a VERY long time."
+  echo "You can watch progress in another console via:"
+  echo "    tail -f ${GLSOURCES}/gcc-${gcc_version}/build/gcc.check.log"
+  chown -R tester .
+  su tester -c "PATH=$PATH make -k check > gcc.check.log"
+  mv gcc.check.log ${GLSOURCES}/
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.28-ncurses.sh b/CH8Build/CH08.28-ncurses.sh
index ac9bc63..50a2cd3 100644
--- a/CH8Build/CH08.28-ncurses.sh
+++ b/CH8Build/CH08.28-ncurses.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d ncurses-${ncurses_version} ] && rm -rf ncurses-${ncurses_version}
 
diff --git a/CH8Build/CH08.29-sed.sh b/CH8Build/CH08.29-sed.sh
index 464f50f..ac1cc76 100644
--- a/CH8Build/CH08.29-sed.sh
+++ b/CH8Build/CH08.29-sed.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d sed-${sed_version} ] && rm -rf sed-${sed_version}
 
@@ -23,6 +23,12 @@ if [ $? -ne 0 ]; then
   myfail "Failed building sed html"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  chown -R tester .
+  su tester -c "PATH=$PATH make check > sed.check.log"
+  mv sed.check.log ${GLSOURCES}/
+fi
+
 make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing sed"
diff --git a/CH8Build/CH08.30-psmisc.sh b/CH8Build/CH08.30-psmisc.sh
index 2821ada..8e00f81 100644
--- a/CH8Build/CH08.30-psmisc.sh
+++ b/CH8Build/CH08.30-psmisc.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d psmisc-${psmisc_version} ] && rm -rf psmisc-${psmisc_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building psmisc"
 fi
 
-echo "running psmisc make check"
-make check > ${GLSOURCES}/psmisc.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running psmisc make check"
+  make check > ${GLSOURCES}/psmisc.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.31-gettext.sh b/CH8Build/CH08.31-gettext.sh
index 840304b..4c146dc 100644
--- a/CH8Build/CH08.31-gettext.sh
+++ b/CH8Build/CH08.31-gettext.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d gettext-${gettext_version} ] && rm -rf gettext-${gettext_version}
 
@@ -21,8 +21,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building gettext"
 fi
 
-echo "running gettext make check"
-make check > ${GLSOURCES}/gettext.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running gettext make check"
+  make check > ${GLSOURCES}/gettext.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.32-bison.sh b/CH8Build/CH08.32-bison.sh
index 3fbb30b..8d593ab 100644
--- a/CH8Build/CH08.32-bison.sh
+++ b/CH8Build/CH08.32-bison.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d bison-${bison_version} ] && rm -rf bison-${bison_version}
 
@@ -20,8 +20,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building bison"
 fi
 
-echo "running bison make check"
-make check > ${GLSOURCES}/bison.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running bison make check"
+  make check > ${GLSOURCES}/bison.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.33-grep.sh b/CH8Build/CH08.33-grep.sh
index 8161541..0f1c0df 100644
--- a/CH8Build/CH08.33-grep.sh
+++ b/CH8Build/CH08.33-grep.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d grep-${grep_version} ] && rm -rf grep-${grep_version}
 
@@ -21,8 +21,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building grep"
 fi
 
-echo "running grep make check"
-make check > ${GLSOURCES}/grep.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running grep make check"
+  make check > ${GLSOURCES}/grep.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.34-bash.sh b/CH8Build/CH08.34-bash.sh
index eca1cc0..dd4c892 100644
--- a/CH8Build/CH08.34-bash.sh
+++ b/CH8Build/CH08.34-bash.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d bash-${bash_version} ] && rm -rf bash-${bash_version}