Merge pull request #1766 from jaggededgedjustice/polish-gnu-tests

* Re-add fixed test

* Stop tests failing on utils that aren't the focus of the test

* Use which to find system utils

* Move timeout to per-test script

Move to a timeout applied to each script and re add the tests that are hanging so they show as failing

* Typo

* Use system timeout command

* Add 4 hour global timeout for protection

* Stop seq-precision.sh causing jams in make

* Shorten the timeout on seq-precision

* Try removing seq-precision

* Keep producing logs even if make hangs

* Add timeouts to other tests that hang

* More tight timeouts

* Remove unbuffer

This causes the make process to hang for some reason, and it itsn't providing any real advantage so it's taken out

* Create *sum binaries for tests

* Use system sha1sum in factor tests

* generate all factor scripts

* fail tests for any binary not built

* Fix tests still failing for the wrong reason

* Revert "Remove unbuffer"

This reverts commit bbce179115.

* Revert "Revert "Remove unbuffer""

This reverts commit 8dae8b798a.

* Use system utils

* clean up sed commands

* clean up workflow script

* Remove use of which to set system binaries

* Don't fail the job if test-suite.log is missing

* Fix typo

* Fix more problems with utils that aren't being tested

* Fix yaml syntax

* Fix test setup

.github/workflows/GNU.yml

@@ -34,46 +34,74 @@ jobs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install autoconf autopoint bison texinfo gperf gcc g++ gdb python-pyinotify expect python3-sphinx
+        sudo apt-get install autoconf autopoint bison texinfo gperf gcc g++ gdb python-pyinotify python3-sphinx
         pushd uutils
         make PROFILE=release
         BUILDDIR="$PWD/target/release/"
+        cp "${BUILDDIR}/install" "${BUILDDIR}/ginstall" # The GNU tests rename this script before running, to avoid confusion with the make target
+        # Create *sum binaries
+        for sum in b2sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum
+        do
+          sum_path="${BUILDDIR}/${sum}"
+          test -f "${sum_path}" || cp "${BUILDDIR}/hashsum" "${sum_path}"
+        done
+        test -f "${BUILDDIR}/[" || cp "${BUILDDIR}/test" "${BUILDDIR}/["
         popd
         GNULIB_SRCDIR="$PWD/gnulib"
         pushd gnu/
+
+        # Any binaries that aren't built become `false` so their tests fail
+        for binary in $(./build-aux/gen-lists-of-programs.sh --list-progs)
+        do
+          bin_path="${BUILDDIR}/${binary}"
+          test -f "${bin_path}" || { echo "'${binary}' was not built with uutils, using the 'false' program"; cp "${BUILDDIR}/false" "${bin_path}"; }
+        done
+
         ./bootstrap --gnulib-srcdir="$GNULIB_SRCDIR"
         ./configure --quiet --disable-gcc-warnings
+        #Add timeout to to protect against hangs
+        sed -i 's|"\$@|/usr/bin/timeout 600 "\$@|' build-aux/test-driver
         # Change the PATH in the Makefile to test the uutils coreutils instead of the GNU coreutils
         sed -i "s/^[[:blank:]]*PATH=.*/  PATH='${BUILDDIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" Makefile
         sed -i 's| tr | /usr/bin/tr |' tests/init.sh
         make
         # Generate the factor tests, so they can be fixed
-        for i in $(seq -w 1 36)
+        for i in {00..36}
         do
           make tests/factor/t${i}.sh
         done
         grep -rl 'path_prepend_' tests/* | xargs sed -i 's|path_prepend_ ./src||'
-        sed -i -e 's|^seq |/usr/bin/seq |' tests/factor/t*sh
+        sed -i -e 's|^seq |/usr/bin/seq |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*sh
-        sed -i -e '/tests\/misc\/cat-self.sh/ D' Makefile # issue #1707
+
-        sed -i -e '/tests\/misc\/numfmt.pl/ D' Makefile # issue #1708
-        sed -i -e '/tests\/chown\/preserve-root.sh/ D' Makefile # issue #1709
-        sed -i -e '/tests\/cp\/file-perm-race.sh/ D' Makefile # issue #1710
-        sed -i -e '/tests\/cp\/special-f.sh/ D' Makefile # issue #1710
-        sed -i -e '/tests\/mv\/mv-special-1.sh/ D' Makefile # issue #1710
-        sed -i -e '/tests\/dd\/stats.sh/ D' Makefile # issue #1710
-        sed -i -e '/tests\/cp\/existing-perm-race.sh/ D' Makefile # hangs, cp doesn't implement --copy-contents
-        # Remove tests that rely on seq with large numbers. See issue #1703
-        sed -i -e '/tests\/misc\/seq.pl/ D' \
-               -e '/tests\/misc\/seq-precision.sh/D' \
-               Makefile
         # Remove tests checking for --version & --help
         # Not really interesting for us and logs are too big
         sed -i -e '/tests\/misc\/invalid-opt.pl/ D' \
                -e '/tests\/misc\/help-version.sh/ D' \
                -e '/tests\/misc\/help-version-getopt.sh/ D' \
                Makefile
-        sed -i -e '/tests\/tail-2\/pid.sh/ D' Makefile # hangs on github, tail doesn't support -f
+
-        sed -i -e'/incompat4/ D' -e"/options '-co' are incompatible/ d" tests/misc/sort.pl # Sort doesn't correctly check for incompatible options, waits for input
+        # Use the system coreutils where the test fails due to error in a util that is not the one being tested
+        sed -i 's|stat|/usr/bin/stat|' tests/chgrp/basic.sh tests/cp/existing-perm-dir.sh tests/touch/60-seconds.sh tests/misc/sort-compress-proc.sh
+        sed -i 's|ls -|/usr/bin/ls -|' tests/chgrp/posix-H.sh tests/chown/deref.sh tests/cp/same-file.sh tests/misc/mknod.sh tests/mv/part-symlink.sh tests/du/8gb.sh
+        sed -i 's|mkdir |/usr/bin/mkdir |' tests/cp/existing-perm-dir.sh tests/rm/empty-inacc.sh
+        sed -i 's|timeout \([[:digit:]]\)| /usr/bin/timeout \1|' tests/tail-2/inotify-rotate.sh tests/tail-2/inotify-dir-recreate.sh tests/tail-2/inotify-rotate-resources.sh tests/cp/parent-perm-race.sh tests/ls/infloop.sh tests/misc/sort-exit-early.sh tests/misc/sort-NaN-infloop.sh tests/misc/uniq-perf.sh tests/tail-2/inotify-only-regular.sh tests/tail-2/pipe-f2.sh tests/tail-2/retry.sh tests/tail-2/symlink.sh tests/tail-2/wait.sh tests/tail-2/pid.sh tests/dd/stats.sh tests/tail-2/follow-name.sh # Don't break the function called 'grep_timeout'
+        sed -i 's|chmod |/usr/bin/chmod |' tests/du/inacc-dir.sh tests/mkdir/p-3.sh tests/tail-2/tail-n0f.sh tests/cp/fail-perm.sh tests/du/inaccessible-cwd.sh tests/mv/i-2.sh tests/chgrp/basic.sh
+        sed -i 's|sort |/usr/bin/sort |' tests/ls/hyperlink.sh tests/misc/test-N.sh
+        sed -i 's|split |/usr/bin/split |' tests/misc/factor-parallel.sh
+        sed -i 's|truncate |/usr/bin/truncate |' tests/split/fail.sh
+        sed -i 's|dd |/usr/bin/dd |' tests/du/8gb.sh tests/tail-2/big-4gb.sh tests/cp/fiemap-2.sh init.cfg
+        sed -i 's|id -|/usr/bin/id -|' tests/misc/runcon-no-reorder.sh
+        sed -i 's|touch |/usr/bin/touch |' tests/cp/preserve-link.sh tests/cp/reflink-perm.sh tests/ls/block-size.sh tests/ls/abmon-align.sh tests/ls/rt-1.sh tests/mv/update.sh tests/misc/ls-time.sh tests/misc/stat-nanoseconds.sh tests/misc/time-style.sh tests/misc/test-N.sh
+        sed -i 's|ln -|/usr/bin/ln -|' tests/cp/link-deref.sh
+        sed -i 's|printf |/usr/bin/printf |' tests/dd/ascii.sh
+        sed -i 's|cp |/usr/bin/cp |' tests/mv/hard-2.sh
+        sed -i 's|paste |/usr/bin/paste |' tests/misc/od-endian.sh
+        sed -i 's|seq |/usr/bin/seq |' tests/misc/sort-discrim.sh
+
+        #Add specific timeout to tests that currently hang to limit time spent waiting
+        sed -i 's|seq \$|/usr/bin/timeout 0.1 seq \$|' tests/misc/seq-precision.sh tests/misc/seq-long-double.sh
+        sed -i 's|cat |/usr/bin/timeout 0.1 cat |' tests/misc/cat-self.sh
+         
 
         test -f "${BUILDDIR}/getlimits" || cp src/getlimits "${BUILDDIR}"
     - name: Run GNU tests
@@ -83,17 +111,22 @@ jobs:
         GNULIB_DIR="${PWD}/gnulib"
         pushd gnu
 
-        unbuffer timeout -sKILL 3600 make -j "$(nproc)" check SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no || :
+        timeout -sKILL 2h make -j "$(nproc)" check SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no || : # Kill after 4 hours in case something gets stuck in make
     - name: Extract tests info
       shell: bash
       run: |
-        TOTAL=$( grep "# TOTAL:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+        if test -f gnu/tests/test-suite.log
-        PASS=$( grep "# PASS:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+        then
-        SKIP=$( grep "# SKIP:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+            TOTAL=$( grep "# TOTAL:" gnu/tests/test-suite.log|cut -d' ' -f2-)
-        FAIL=$( grep "# FAIL:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+            PASS=$( grep "# PASS:" gnu/tests/test-suite.log|cut -d' ' -f2-)
-        XPASS=$( grep "# XPASS:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+            SKIP=$( grep "# SKIP:" gnu/tests/test-suite.log|cut -d' ' -f2-)
-        ERROR=$( grep "# ERROR:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+            FAIL=$( grep "# FAIL:" gnu/tests/test-suite.log|cut -d' ' -f2-)
-        echo "::warning ::GNU testsuite = $TOTAL / $PASS / $FAIL / $ERROR"
+            XPASS=$( grep "# XPASS:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+            ERROR=$( grep "# ERROR:" gnu/tests/test-suite.log|cut -d' ' -f2-)
+            echo "::warning ::GNU testsuite = $TOTAL / $PASS / $FAIL / $ERROR"
+          else
+            echo "::error ::Failed to get summary of test results"
+          fi
 
     - uses: actions/upload-artifact@v2
       with: