gnu/ci: move the operations into script to run them locally

.github/workflows/GNU.yml

@@ -40,85 +40,12 @@ jobs:
     - name: Build binaries
       shell: bash
       run: |
-        pushd uutils
+       cd uutils
-        make PROFILE=release
+       bash util/build-gnu.sh
-        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 {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 |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*sh
-
-        # 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
-
-        # printf doesn't limit the values used in its arg, so this produced ~2GB of output
-        sed -i '/INT_OFLOW/ D' tests/misc/printf.sh
-
-        # 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 tests/misc/shuf.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 tests/misc/shuf.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 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
       shell: bash
       run: |
-        BUILDDIR="${PWD}/uutils/target/release"
+        bash uutils/util/run-gnu-test.sh
-        GNULIB_DIR="${PWD}/gnulib"
-        pushd gnu
-
-        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: |

util/build-gnu.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+set -e
+if test ! -d ../gnu; then
+    echo "Could not find ../gnu"
+    echo "git clone git@github.com:coreutils/coreutils.git ../gnu"
+    exit 1
+fi
+if test ! -d ../gnulib; then
+    echo "Could not find ../gnulib"
+    echo "git clone git@github.com:coreutils/gnulib.git ../gnulib"
+    exit 1
+fi
+
+
+pushd $(pwd)
+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 {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 |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*sh
+
+# 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
+
+# printf doesn't limit the values used in its arg, so this produced ~2GB of output
+sed -i '/INT_OFLOW/ D' tests/misc/printf.sh
+
+# 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 tests/misc/shuf.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 tests/misc/shuf.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 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}"
+

util/run-gnu-test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+BUILDDIR="${PWD}/uutils/target/release"
+GNULIB_DIR="${PWD}/gnulib"
+pushd gnu
+
+timeout -sKILL 2h make -j "$(nproc)" check SUBDIRS=. RUN_EXPENSIVE_TESTS=no RUN_VERY_EXPENSIVE_TESTS=no VERBOSE=no || : # Kill after 4 hours in case something gets stuck in make