multiple-pipeline-capture/playback wrappers preserve SCRIPT_NAME

This fixes 1398cf4 which broke logging by moving the logs of both tests into the same logs/multiple-pipeline/ directory Signed-off-by: Marc Herbert <[email protected]>
thesofproject · Dec 4, 2020 · 89cf4cb · 89cf4cb
1 parent f39d706
commit 89cf4cb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/case-lib/lib.sh b/case-lib/lib.sh
@@ -4,8 +4,11 @@
 SCRIPT_HOME="$(dirname "$0")"
 # get test-case parent folder name
 SCRIPT_HOME=$(cd "$SCRIPT_HOME/.." && pwd)
+
+# Let some wrappers override this if they want
 # shellcheck disable=SC2034 # external script can use it
-SCRIPT_NAME="$0"  # get test-case script load name
+: "${SCRIPT_NAME:="$0"}"  # get test-case script load name
+
 # shellcheck disable=SC2034 # external script can use it
 SCRIPT_PRAM="$*"  # get test-case parameter
 

diff --git a/test-case/multiple-pipeline-capture.sh b/test-case/multiple-pipeline-capture.sh
@@ -5,4 +5,5 @@ set -e
 TESTDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 
 # Need "exec" otherwise it believes to be a Sub-Test
+export SCRIPT_NAME="$0"
 exec "$TESTDIR"/test-case/multiple-pipeline.sh -f c "$@"
diff --git a/test-case/multiple-pipeline-playback.sh b/test-case/multiple-pipeline-playback.sh
@@ -5,4 +5,5 @@ set -e
 TESTDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 
 # Need "exec" otherwise it believes to be a Sub-Test
+export SCRIPT_NAME="$0"
 exec "$TESTDIR"/test-case/multiple-pipeline.sh -f p "$@"