From 20046013fbd6c00ea0b4f9317167a60e4a7254e1 Mon Sep 17 00:00:00 2001
From: jaggededgedjustice <jaggededgedjustice@gmail.com>
Date: Thu, 21 Jan 2021 22:56:02 +0000
Subject: [PATCH] Cleanup gnu test script (#1701)

---
 .github/workflows/GNU.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/GNU.yml b/.github/workflows/GNU.yml
index 1a635ea15..9b6b60c08 100644
--- a/.github/workflows/GNU.yml
+++ b/.github/workflows/GNU.yml
@@ -30,7 +30,7 @@ jobs:
         default: true
         profile: minimal # minimal component installation (ie, no documentation)
         components: rustfmt
-    - name: Run gnu tests
+    - name: Build binaries
       shell: bash
       run: |
         pushd uutils
@@ -40,13 +40,20 @@ jobs:
         GNULIB_SRCDIR="$PWD/gnulib"
         pushd gnu/
         sudo apt-get update
-        sudo apt-get install autoconf autopoint bison texinfo gperf gcc gdb python-pyinotify
+        sudo apt-get install autoconf autopoint bison texinfo gperf gcc gdb python-pyinotify expect
         ./bootstrap --gnulib-srcdir="$GNULIB_SRCDIR"
         ./configure --quiet --disable-gcc-warnings
         # 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
-        test -f $BUILDDIR/getlimits || cp src/getlimits $BUILDDIR
+        test -f "${BUILDDIR}/getlimits" || cp src/getlimits "${BUILDDIR}"
+    - name: Run GNU tests
+      shell: bash
+      run: |
+        BUILDDIR="${PWD}/uutils/target/release"
+        GNULIB_DIR="${PWD}/gnulib"
+        pushd gnu
         ulimit -t 60
-        make -j "$(nproc)" check SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no || :
+        
+        unbuffer make -j "$(nproc)" check SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no || :