diff --git a/CH8Build/CH08.15-expect.sh b/CH8Build/CH08.15-expect.sh index f53a07a..da16bd5 100644 --- a/CH8Build/CH08.15-expect.sh +++ b/CH8Build/CH08.15-expect.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 expect${expect_version} ] && rm -rf expect${expect_version} @@ -26,8 +26,10 @@ if [ $? -ne 0 ]; then myfail "Failed building expect" fi -echo "running expect make test" -make test > ${GLSOURCES}/expect.check 2>&1 +if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then + echo "running expect make test" + make test > ${GLSOURCES}/expect.check.log 2>&1 +fi make install if [ $? -ne 0 ]; then diff --git a/CH8Build/CH08.16-dejagnu.sh b/CH8Build/CH08.16-dejagnu.sh index 9f119e6..40f720b 100644 --- a/CH8Build/CH08.16-dejagnu.sh +++ b/CH8Build/CH08.16-dejagnu.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 dejagnu-${dejagnu_version} ] && rm -rf dejagnu-${dejagnu_version} @@ -19,8 +19,10 @@ mkdir build && cd build makeinfo --html --no-split -o doc/dejagnu.html ../doc/dejagnu.texi makeinfo --plaintext -o doc/dejagnu.txt ../doc/dejagnu.texi -echo "running dejagnu make check" -make check > ${GLSOURCES}/dejagnu.check 2>&1 +if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then + echo "running dejagnu make check" + make check > ${GLSOURCES}/dejagnu.check.log 2>&1 +fi make install if [ $? -ne 0 ]; then diff --git a/CH8Build/CH08.17-pkgconf.sh b/CH8Build/CH08.17-pkgconf.sh index 5c0e5c6..a0dfd70 100644 --- a/CH8Build/CH08.17-pkgconf.sh +++ b/CH8Build/CH08.17-pkgconf.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 pkgconf-${pkgconf_version} ] && rm -rf pkgconf-${pkgconf_version} diff --git a/CH8Build/CH08.18-binutils.sh b/CH8Build/CH08.18-binutils.sh index 1e016d8..2d48f59 100644 --- a/CH8Build/CH08.18-binutils.sh +++ b/CH8Build/CH08.18-binutils.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 binutils-${binutils_version} ] && rm -rf binutils-${binutils_version} @@ -31,9 +31,15 @@ if [ $? -ne 0 ]; then myfail "Failed building binutils" fi -echo "running binutils make check" -make -k check > ${GLSOURCES}/binutils.check 2>&1 -grep '^FAIL:' ${GLSOURCES}/binutils.check > ${GLSOURCES}/binutils.check.fail +# LFS book says not to skip under any circumstances and I agree but tests really +# slow down development so I say when building final system, do not skip ANY +# of the tests but okay to skip when making USB boot thumb drive to do the +# final install from +if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then + echo "running binutils make check" + make -k check > ${GLSOURCES}/binutils.check.log 2>&1 + grep '^FAIL:' ${GLSOURCES}/binutils.check.log > ${GLSOURCES}/binutils.check.fail.log +fi make tooldir=/usr install if [ $? -ne 0 ]; then diff --git a/CH8Build/CH08.19-gmp.sh b/CH8Build/CH08.19-gmp.sh index c6d37fe..f4b5045 100644 --- a/CH8Build/CH08.19-gmp.sh +++ b/CH8Build/CH08.19-gmp.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 gmp-${gmp_version} ] && rm -rf gmp-${gmp_version} @@ -27,9 +27,11 @@ if [ $? -ne 0 ]; then myfail "Failed building gmp html" fi - -echo "running gmp make check" -make check > ${GLSOURCES}/gmp.check 2>&1 +if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then + echo "running gmp make check" + make check > ${GLSOURCES}/gmp.check.log 2>&1 + awk '/# PASS:/{total+=$3} ; END{print total}' ${GLSOURCES}/gmp.check.log > ${GLSOURCES}/gmp.check.pass.log +fi make install if [ $? -ne 0 ]; then diff --git a/CH8Build/CH08.20-mpfr.sh b/CH8Build/CH08.20-mpfr.sh index c8bac2c..76f9cd3 100644 --- a/CH8Build/CH08.20-mpfr.sh +++ b/CH8Build/CH08.20-mpfr.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 mpfr-${mpfr_version} ] && rm -rf mpfr-${mpfr_version} @@ -26,8 +26,10 @@ if [ $? -ne 0 ]; then myfail "Failed building mpfr html" fi -echo "running mpfr make check" -make check > ${GLSOURCES}/mpfr.check 2>&1 +if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then + echo "running mpfr make check" + make check > ${GLSOURCES}/mpfr.check.log 2>&1 +fi make install if [ $? -ne 0 ]; then