Skip to content

Commit 89cf4cb

Browse files
committed
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 <marc.herbert@intel.com>
1 parent f39d706 commit 89cf4cb

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

case-lib/lib.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
SCRIPT_HOME="$(dirname "$0")"
55
# get test-case parent folder name
66
SCRIPT_HOME=$(cd "$SCRIPT_HOME/.." && pwd)
7+
8+
# Let some wrappers override this if they want
79
# shellcheck disable=SC2034 # external script can use it
8-
SCRIPT_NAME="$0" # get test-case script load name
10+
: "${SCRIPT_NAME:="$0"}" # get test-case script load name
11+
912
# shellcheck disable=SC2034 # external script can use it
1013
SCRIPT_PRAM="$*" # get test-case parameter
1114

test-case/multiple-pipeline-capture.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ set -e
55
TESTDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
66

77
# Need "exec" otherwise it believes to be a Sub-Test
8+
export SCRIPT_NAME="$0"
89
exec "$TESTDIR"/test-case/multiple-pipeline.sh -f c "$@"

test-case/multiple-pipeline-playback.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ set -e
55
TESTDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
66

77
# Need "exec" otherwise it believes to be a Sub-Test
8+
export SCRIPT_NAME="$0"
89
exec "$TESTDIR"/test-case/multiple-pipeline.sh -f p "$@"

0 commit comments

Comments
 (0)