]> granicus.if.org Git - strace/commitdiff
tests: export a path to the trace executable to check_PROGRAMS
authorDmitry V. Levin <ldv@altlinux.org>
Sat, 5 Aug 2017 23:05:54 +0000 (23:05 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 6 Aug 2017 00:23:20 +0000 (00:23 +0000)
* tests/init.sh (STRACE_EXE): Initialize from $STRACE and export.

tests/init.sh

index 06ff7a764835e0ade0e5cc932727098733ab3b00..4cb8f1ab618a744798cccb35c823411ed725f87a 100644 (file)
@@ -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}"