From e50c19f284dad6b4b7b79f91cc8576a97626be8a Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 16 Dec 2022 15:32:04 -0500
Subject: tests: Turn on set -e

---
 tests/posix/exec_plus_nonexistent.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'tests/posix/exec_plus_nonexistent.sh')

diff --git a/tests/posix/exec_plus_nonexistent.sh b/tests/posix/exec_plus_nonexistent.sh
index f96099e..6c9cb8c 100644
--- a/tests/posix/exec_plus_nonexistent.sh
+++ b/tests/posix/exec_plus_nonexistent.sh
@@ -1,5 +1,4 @@
-stderr=$(invoke_bfs basic -exec "$TESTS/nonexistent" {} + 2>&1 >/dev/null)
-[ -n "$stderr" ] || return 1
+! stderr=$(invoke_bfs basic -exec "$TESTS/nonexistent" {} + 2>&1 >/dev/null)
+[ -n "$stderr" ]
 
-bfs_diff basic -exec "$TESTS/nonexistent" {} + -print
-(($? == EX_BFS))
+check_exit $EX_BFS bfs_diff basic -exec "$TESTS/nonexistent" {} + -print
-- 
cgit v1.2.3


From e2b540c9e2a52500b17fa1005b26b2dd5a652c09 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 16 Dec 2022 16:43:25 -0500
Subject: tests: Fail early in bfs_diff if the diff fails

Otherwise, propagate the exit code from bfs
---
 tests/bfs/execdir_plus_nonexistent.sh |  2 +-
 tests/bsd/X.sh                        |  2 +-
 tests/common/execdir_nonexistent.sh   |  2 +-
 tests/gnu/L_loops_continue.sh         |  2 +-
 tests/gnu/printf_Y_error.sh           |  2 +-
 tests/posix/depth_error.sh            |  2 +-
 tests/posix/exec_nonexistent.sh       |  2 +-
 tests/posix/exec_plus_nonexistent.sh  |  2 +-
 tests/posix/exec_plus_status.sh       |  2 +-
 tests/tests.sh                        | 13 +++----------
 10 files changed, 12 insertions(+), 19 deletions(-)

(limited to 'tests/posix/exec_plus_nonexistent.sh')

diff --git a/tests/bfs/execdir_plus_nonexistent.sh b/tests/bfs/execdir_plus_nonexistent.sh
index 88f3e90..e3b4d2d 100644
--- a/tests/bfs/execdir_plus_nonexistent.sh
+++ b/tests/bfs/execdir_plus_nonexistent.sh
@@ -1,4 +1,4 @@
 ! stderr=$(invoke_bfs basic -execdir "$TESTS/nonexistent" {} + 2>&1 >/dev/null)
 [ -n "$stderr" ]
 
-check_exit $EX_BFS bfs_diff basic -execdir "$TESTS/nonexistent" {} + -print
+! bfs_diff basic -execdir "$TESTS/nonexistent" {} + -print
diff --git a/tests/bsd/X.sh b/tests/bsd/X.sh
index df9a261..54000cf 100644
--- a/tests/bsd/X.sh
+++ b/tests/bsd/X.sh
@@ -1 +1 @@
-check_exit $EX_BFS bfs_diff -X weirdnames
+! bfs_diff -X weirdnames
diff --git a/tests/common/execdir_nonexistent.sh b/tests/common/execdir_nonexistent.sh
index af17fe5..4bb4fdb 100644
--- a/tests/common/execdir_nonexistent.sh
+++ b/tests/common/execdir_nonexistent.sh
@@ -1,4 +1,4 @@
 ! stderr=$(invoke_bfs basic -execdir "$TESTS/nonexistent" {} \; 2>&1 >/dev/null)
 [ -n "$stderr" ]
 
-check_exit $EX_BFS bfs_diff basic -print -execdir "$TESTS/nonexistent" {} \; -print
+! bfs_diff basic -print -execdir "$TESTS/nonexistent" {} \; -print
diff --git a/tests/gnu/L_loops_continue.sh b/tests/gnu/L_loops_continue.sh
index d4c95f1..55aeb33 100644
--- a/tests/gnu/L_loops_continue.sh
+++ b/tests/gnu/L_loops_continue.sh
@@ -1 +1 @@
-check_exit $EX_BFS bfs_diff -L loops
+! bfs_diff -L loops
diff --git a/tests/gnu/printf_Y_error.sh b/tests/gnu/printf_Y_error.sh
index e9a2083..3aa816e 100644
--- a/tests/gnu/printf_Y_error.sh
+++ b/tests/gnu/printf_Y_error.sh
@@ -5,4 +5,4 @@ ln -s foo/bar scratch/bar
 chmod -x scratch/foo
 trap "chmod +x scratch/foo" EXIT
 
-check_exit $EX_BFS bfs_diff scratch -printf '(%p) (%l) %y %Y\n'
+! bfs_diff scratch -printf '(%p) (%l) %y %Y\n'
diff --git a/tests/posix/depth_error.sh b/tests/posix/depth_error.sh
index 15cc82d..e91fbf6 100644
--- a/tests/posix/depth_error.sh
+++ b/tests/posix/depth_error.sh
@@ -4,4 +4,4 @@ clean_scratch
 chmod a-r scratch/foo
 trap "chmod +r scratch/foo" EXIT
 
-check_exit $EX_BFS bfs_diff scratch -depth
+! bfs_diff scratch -depth
diff --git a/tests/posix/exec_nonexistent.sh b/tests/posix/exec_nonexistent.sh
index d4ad92a..901be86 100644
--- a/tests/posix/exec_nonexistent.sh
+++ b/tests/posix/exec_nonexistent.sh
@@ -4,4 +4,4 @@
 ! stderr=$(invoke_bfs basic -exec "$TESTS/nonexistent" {} \; 2>&1 >/dev/null)
 [ -n "$stderr" ]
 
-check_exit $EX_BFS bfs_diff basic -print -exec "$TESTS/nonexistent" {} \; -print
+! bfs_diff basic -print -exec "$TESTS/nonexistent" {} \; -print
diff --git a/tests/posix/exec_plus_nonexistent.sh b/tests/posix/exec_plus_nonexistent.sh
index 6c9cb8c..6bddc67 100644
--- a/tests/posix/exec_plus_nonexistent.sh
+++ b/tests/posix/exec_plus_nonexistent.sh
@@ -1,4 +1,4 @@
 ! stderr=$(invoke_bfs basic -exec "$TESTS/nonexistent" {} + 2>&1 >/dev/null)
 [ -n "$stderr" ]
 
-check_exit $EX_BFS bfs_diff basic -exec "$TESTS/nonexistent" {} + -print
+! bfs_diff basic -exec "$TESTS/nonexistent" {} + -print
diff --git a/tests/posix/exec_plus_status.sh b/tests/posix/exec_plus_status.sh
index f44062e..a814c4e 100644
--- a/tests/posix/exec_plus_status.sh
+++ b/tests/posix/exec_plus_status.sh
@@ -1,3 +1,3 @@
 # -exec ... {} + should always return true, but if the command fails, bfs
 # should exit with a non-zero status
-check_exit $EX_BFS bfs_diff basic -exec false {} + -print
+! bfs_diff basic -exec false {} + -print
diff --git a/tests/tests.sh b/tests/tests.sh
index 4a95fca..9bf9b8b 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -500,8 +500,6 @@ else
     DIFF="diff"
 fi
 
-# Return value when bfs fails
-EX_BFS=10
 # Return value when a difference is detected
 EX_DIFF=20
 # Return value when a test is skipped
@@ -529,15 +527,10 @@ function bfs_diff() (
     exec 3>&-
 
     "${BFS[@]}" "$@" | sort >"$OUT"
-    local STATUS="${PIPESTATUS[0]}"
+    local status="${PIPESTATUS[0]}"
 
-    diff_output || return $EX_DIFF
-
-    if [ "$STATUS" -eq 0 ]; then
-        return 0
-    else
-        return $EX_BFS
-    fi
+    diff_output || exit $EX_DIFF
+    return "$status"
 )
 
 function skip() {
-- 
cgit v1.2.3


From de8e0fbb8c1e59b3f1af72a07477b63a8f0bbc75 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 23 Oct 2023 11:42:33 -0400
Subject: tests: Fix Bash 3 compatibility

---
 tests/bfs/execdir_plus_nonexistent.sh |  6 ++---
 tests/common/execdir_nonexistent.sh   |  6 ++---
 tests/posix/L_loops.sh                |  4 ++--
 tests/posix/exec_nonexistent.sh       |  7 ++----
 tests/posix/exec_plus_nonexistent.sh  |  6 ++---
 tests/run.sh                          | 44 +++++++++++++++++++++++++----------
 tests/util.sh                         | 11 ++++-----
 7 files changed, 47 insertions(+), 37 deletions(-)

(limited to 'tests/posix/exec_plus_nonexistent.sh')

diff --git a/tests/bfs/execdir_plus_nonexistent.sh b/tests/bfs/execdir_plus_nonexistent.sh
index e3b4d2d..ed7ed56 100644
--- a/tests/bfs/execdir_plus_nonexistent.sh
+++ b/tests/bfs/execdir_plus_nonexistent.sh
@@ -1,4 +1,2 @@
-! stderr=$(invoke_bfs basic -execdir "$TESTS/nonexistent" {} + 2>&1 >/dev/null)
-[ -n "$stderr" ]
-
-! bfs_diff basic -execdir "$TESTS/nonexistent" {} + -print
+bfs_diff basic -execdir "$TESTS/nonexistent" {} + -print 2>"$TEST/err" && fail
+test -s "$TEST/err"
diff --git a/tests/common/execdir_nonexistent.sh b/tests/common/execdir_nonexistent.sh
index 4bb4fdb..0ec013c 100644
--- a/tests/common/execdir_nonexistent.sh
+++ b/tests/common/execdir_nonexistent.sh
@@ -1,4 +1,2 @@
-! stderr=$(invoke_bfs basic -execdir "$TESTS/nonexistent" {} \; 2>&1 >/dev/null)
-[ -n "$stderr" ]
-
-! bfs_diff basic -print -execdir "$TESTS/nonexistent" {} \; -print
+bfs_diff basic -print -execdir "$TESTS/nonexistent" {} \; -print 2>"$TEST/err" && fail
+test -s "$TEST/err"
diff --git a/tests/posix/L_loops.sh b/tests/posix/L_loops.sh
index 1314401..01b7efc 100644
--- a/tests/posix/L_loops.sh
+++ b/tests/posix/L_loops.sh
@@ -1,4 +1,4 @@
 # POSIX says it's okay to either stop or keep going on seeing a filesystem
 # loop, as long as a diagnostic is printed
-! errors=$(invoke_bfs -L loops 2>&1 >/dev/null)
-[ -n "$errors" ]
+invoke_bfs -L loops >/dev/null 2>"$OUT" && fail
+test -s "$OUT"
diff --git a/tests/posix/exec_nonexistent.sh b/tests/posix/exec_nonexistent.sh
index 901be86..a9ff052 100644
--- a/tests/posix/exec_nonexistent.sh
+++ b/tests/posix/exec_nonexistent.sh
@@ -1,7 +1,4 @@
 # Failure to execute the command should lead to an error message and
 # non-zero exit status.  See https://unix.stackexchange.com/q/704522/56202
-
-! stderr=$(invoke_bfs basic -exec "$TESTS/nonexistent" {} \; 2>&1 >/dev/null)
-[ -n "$stderr" ]
-
-! bfs_diff basic -print -exec "$TESTS/nonexistent" {} \; -print
+bfs_diff basic -print -exec "$TESTS/nonexistent" {} \; -print 2>"$TEST/err" && fail
+test -s "$TEST/err"
diff --git a/tests/posix/exec_plus_nonexistent.sh b/tests/posix/exec_plus_nonexistent.sh
index 6bddc67..24582a3 100644
--- a/tests/posix/exec_plus_nonexistent.sh
+++ b/tests/posix/exec_plus_nonexistent.sh
@@ -1,4 +1,2 @@
-! stderr=$(invoke_bfs basic -exec "$TESTS/nonexistent" {} + 2>&1 >/dev/null)
-[ -n "$stderr" ]
-
-! bfs_diff basic -exec "$TESTS/nonexistent" {} + -print
+bfs_diff basic -exec "$TESTS/nonexistent" {} + -print 2>"$TEST/err" && fail
+test -s "$TEST/err"
diff --git a/tests/run.sh b/tests/run.sh
index b46fde6..d581476 100644
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -47,7 +47,7 @@ bg_test() {
     if ((VERBOSE_ERRORS)); then
         run_test "$1"
     else
-        run_test "$1" 2>"$TMP/TEST.err"
+        run_test "$1" 2>"$TMP/$TEST.err"
     fi
     ret=$?
 
@@ -59,9 +59,21 @@ bg_test() {
     return $ret
 }
 
-# Reap a background job
-reap() {
-    wait -n
+# Wait for any background job to complete
+if ((BASH_VERSINFO[0] > 4 || (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 3))); then
+    wait_any() {
+        wait -n
+    }
+else
+    wait_any() {
+        read -ra jobs < <(jobs -p)
+        wait ${jobs[0]}
+    }
+fi
+
+# Wait for a background test to finish
+wait_test() {
+    wait_any
     ret=$?
     ((BG--))
 
@@ -118,7 +130,7 @@ run_tests() {
         OUT="$TMP/$TEST.out"
 
         if ((BG >= JOBS)); then
-            reap
+            wait_test
         fi
         ((++BG))
 
@@ -126,7 +138,7 @@ run_tests() {
     done
 
     while ((BG > 0)); do
-        reap
+        wait_test
     done
 
     printf "${BOL}"
@@ -145,6 +157,14 @@ run_tests() {
 
 ## Utilities for the tests themselves
 
+# Default return value for failed tests
+EX_FAIL=1
+
+# Fail the current test
+fail() {
+    exit $EX_FAIL
+}
+
 # Return value when a test is skipped
 EX_SKIP=77
 
@@ -166,9 +186,9 @@ skip() {
 # Run a command and check its exit status
 check_exit() {
     local expected="$1"
-    local actual="0"
+    local actual=0
     shift
-    "$@" || actual="$?"
+    "$@" || actual=$?
     ((actual == expected))
 }
 
@@ -253,9 +273,9 @@ invoke_bfs() {
 
     # Allow bfs to fail, but not crash
     if ((ret > 125)); then
-        exit "$ret"
+        exit $ret
     else
-        return "$ret"
+        return $ret
     fi
 }
 
@@ -275,9 +295,9 @@ bfs_pty() {
     "$UNBUFFER" bash -c 'stty cols 80 rows 24 && "$@"' bash "${BFS[@]}" "$@" || ret=$?
 
     if ((ret > 125)); then
-        exit "$ret"
+        exit $ret
     else
-        return "$ret"
+        return $ret
     fi
 }
 
diff --git a/tests/util.sh b/tests/util.sh
index 31a7b6c..bfa5d16 100644
--- a/tests/util.sh
+++ b/tests/util.sh
@@ -120,7 +120,7 @@ callers() {
 
 # Print a message including path, line number, and command
 debug() {
-    local file="${1/#*\/tests\//tests\/}"
+    local file="${1/#*\/tests\//tests/}"
     set -- "$file" "${@:2}"
     color printf "${BLD}%s:%d:${RST} %s\n    %s\n" "$@"
 }
@@ -136,14 +136,13 @@ quote() {
     fi
 }
 
+DEFER_LEVEL=-1
+
 # Run a command when this (sub)shell exits
 defer() {
-    # Refresh trap state before trap -p
-    # See https://unix.stackexchange.com/a/556888/56202
-    trap -- KILL
-
     # Check if the EXIT trap is already set
-    if ! trap -p EXIT | grep -q pop_defers; then
+    if ((DEFER_LEVEL != BASH_SUBSHELL)); then
+        DEFER_LEVEL=$BASH_SUBSHELL
         DEFER_CMDS=()
         DEFER_LINES=()
         DEFER_FILES=()
-- 
cgit v1.2.3