From 03e1cc1e45b67ad65e5ad0ae47b7a54e68d929d5 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 25 Jul 2023 18:56:53 -0500 Subject: [PATCH] Don't use relative paths for expected/actual so cd/symlinks can't confuse diff --- scripts/runtest.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/runtest.sh b/scripts/runtest.sh index 3d2df237..cb29ffa3 100644 --- a/scripts/runtest.sh +++ b/scripts/runtest.sh @@ -132,15 +132,15 @@ testing() return 0 fi - echo -ne "$3" > ../expected + echo -ne "$3" > "$TESTDIR"/expected [ ! -z "$4" ] && echo -ne "$4" > input || rm -f input - echo -ne "$5" | ${EVAL:-eval --} "$2" > ../actual + echo -ne "$5" | ${EVAL:-eval --} "$2" > "$TESTDIR"/actual RETVAL=$? # Catch segfaults [ $RETVAL -gt 128 ] && echo "exited with signal (or returned $RETVAL)" >> actual - DIFF="$(cd ..; diff -au${NOSPACE:+w} expected actual)" + DIFF="$(cd "$TESTDIR"; diff -au${NOSPACE:+w} expected actual 2>&1)" [ -z "$DIFF" ] && do_pass || VERBOSE=all do_fail if ! verbose_has quiet && { [ -n "$DIFF" ] || verbose_has spam; } then -- 2.39.2