From: Dmitry V. Levin Date: Sat, 5 Aug 2017 23:05:54 +0000 (+0000) Subject: tests: export a path to the trace executable to check_PROGRAMS X-Git-Tag: v4.19~179 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d874bbf61e227f7701968725cd830377fea0ad82;p=strace tests: export a path to the trace executable to check_PROGRAMS * tests/init.sh (STRACE_EXE): Initialize from $STRACE and export. --- diff --git a/tests/init.sh b/tests/init.sh index 06ff7a76..4cb8f1ab 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -341,6 +341,7 @@ case "$ME_" in *) NAME= esac +STRACE_EXE= if [ -n "$NAME" ]; then TESTDIR="$NAME.dir" rm -rf -- "$TESTDIR" @@ -356,6 +357,7 @@ if [ -n "$NAME" ]; then STRACE=../../strace case "${LOG_COMPILER-} ${LOG_FLAGS-}" in *--suppressions=*--error-exitcode=*--tool=*) + STRACE_EXE="$STRACE" # add valgrind command prefix STRACE="${LOG_COMPILER-} ${LOG_FLAGS-} $STRACE" ;; @@ -364,10 +366,13 @@ if [ -n "$NAME" ]; then trap 'dump_log_and_fail_with "time limit ($TIMEOUT_DURATION) exceeded"' XCPU else - [ -n "${STRACE-}" ] || - STRACE=../strace + : "${STRACE:=../strace}" fi +# Export $STRACE_EXE to check_PROGRAMS. +: "${STRACE_EXE:=$STRACE}" +export STRACE_EXE + : "${TIMEOUT_DURATION:=600}" : "${SLEEP_A_BIT:=sleep 1}"