From e82a7f51d4b4e90df868e5410a0445b009b54ff2 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 16 Dec 2022 15:51:59 -0500
Subject: tests: Print the skip reason for --verbose=skipped

---
 tests/bfs/execdir_plus.sh |  5 +----
 tests/tests.sh            | 13 +++++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/bfs/execdir_plus.sh b/tests/bfs/execdir_plus.sh
index 9ae7764..f66b898 100644
--- a/tests/bfs/execdir_plus.sh
+++ b/tests/bfs/execdir_plus.sh
@@ -1,7 +1,4 @@
 tree=$(invoke_bfs -D tree 2>&1 -quit)
-
-if [[ "$tree" == *"-S dfs"* ]]; then
-    skip
-fi
+[[ "$tree" == *"-S dfs"* ]] && skip
 
 bfs_diff basic -execdir "$TESTS/sort-args.sh" {} +
diff --git a/tests/tests.sh b/tests/tests.sh
index 7ccd9b5..4a95fca 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -191,7 +191,6 @@ for arg; do
             VERBOSE_SKIPPED=yes
             ;;
         --verbose=tests)
-            VERBOSE_SKIPPED=yes
             VERBOSE_TESTS=yes
             ;;
         --verbose)
@@ -542,6 +541,15 @@ function bfs_diff() (
 )
 
 function skip() {
+    if [ "$VERBOSE_SKIPPED" ]; then
+        caller | {
+            read -r line file
+            printf "${BOL}${CYN}%s skipped!${RST} (%s)\n" "$TEST" "$(awk "NR == $line" "$file")"
+        }
+    elif [ "$VERBOSE_TESTS" ]; then
+        printf "${BOL}${CYN}%s skipped!${RST}\n" "$TEST"
+    fi
+
     exit $EX_SKIP
 }
 
@@ -673,9 +681,6 @@ for TEST in "${TEST_CASES[@]}"; do
         ((++passed))
     elif ((status == EX_SKIP)); then
         ((++skipped))
-        if [ "$VERBOSE_SKIPPED" ]; then
-            printf "${BOL}${CYN}%s skipped!${RST}\n" "$TEST"
-        fi
     else
         ((++failed))
         [ "$VERBOSE_ERRORS" ] || cat "$TMP/stderr" >&2
-- 
cgit v1.2.3