]> granicus.if.org Git - strace/commitdiff
tests: run every test except ksysent.test in its own subdirectory
authorDmitry V. Levin <ldv@altlinux.org>
Sun, 2 Apr 2017 01:03:24 +0000 (01:03 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 3 Apr 2017 01:06:11 +0000 (01:06 +0000)
Many test executables create temporary files in the current work
directory for the duration of their execution.
This level of test isolation allows more test executables to be invoked
several times simultaneously.

* tests/.gitignore: Add *.dir, remove *.log.*, *.tmp, *.tmp-*,
and *.tmp.* patterns.
* tests/Makefile.am (clean-local, clean-local-check): New rules.
(.PHONY): Add clean-local-check.
(CLEANFILES): Remove all but ksysent.h.
* tests/init.sh: Strip test-specific prefix from LOG, OUT, and EXP
variables.  When invoked from a test, create a new test-specific
directory, chdir into it, and add more ../ prefix to STRACE variable.
(run_prog): Replace "./" with "../".
* tests/attach-f-p.test: Replace "./" with "../".
* tests/attach-p-cmd.test: Likewise.
* tests/bexecve.test: Likewise.
* tests/btrfs-v.test: Likewise.
* tests/btrfs-vw.test: Likewise.
* tests/btrfs-w.test: Likewise.
* tests/count.test: Likewise.
* tests/detach-running.test: Likewise.
* tests/detach-sleeping.test: Likewise.
* tests/detach-stopped.test: Likewise.
* tests/mmap.test: Likewise.
* tests/net-y-unix.test: Likewise.
* tests/net-yy-inet.test: Likewise.
* tests/net-yy-netlink.test: Likewise.
* tests/net-yy-unix.test: Likewise.
* tests/net.test: Likewise.
* tests/opipe.test: Likewise.
* tests/poll.test: Likewise.
* tests/prctl-seccomp-strict.test: Likewise.
* tests/qual_fault-exit_group.test: Likewise.
* tests/qual_fault.test: Likewise.
* tests/qual_inject-error-signal.test: Likewise.
* tests/qual_inject-retval.test: Likewise.
* tests/qual_inject-signal.test: Likewise.
* tests/qual_signal.test: Likewise.
* tests/qual_syscall.test: Likewise.
* tests/readv.test: Likewise.
* tests/redirect-fds.test: Likewise.
* tests/sched.test: Likewise.
* tests/scm_rights-fd.test: Likewise.
* tests/seccomp-strict.test: Likewise.
* tests/strace-C.test: Likewise.
* tests/strace-E.expected: Likewise.
* tests/strace-E.test: Likewise.
* tests/strace-S.test: Likewise.
* tests/strace-T.test: Likewise.
* tests/strace-V.test: Likewise.
* tests/strace-ff.test: Likewise.
* tests/strace-k.test: Likewise.
* tests/strace-r.expected: Likewise.
* tests/strace-r.test: Likewise.
* tests/strace-t.test: Likewise.
* tests/strace-tt.test: Likewise.
* tests/strace-ttt.test: Likewise.
* tests/sun_path.test: Likewise.
* tests/uname.test: Likewise.
* tests/unix-pair-send-recv.test: Likewise.
* tests/unix-pair-sendto-recvfrom.test: Likewise.

51 files changed:
tests/.gitignore
tests/Makefile.am
tests/attach-f-p.test
tests/attach-p-cmd.test
tests/bexecve.test
tests/btrfs-v.test
tests/btrfs-vw.test
tests/btrfs-w.test
tests/count.test
tests/detach-running.test
tests/detach-sleeping.test
tests/detach-stopped.test
tests/init.sh
tests/mmap.test
tests/net-y-unix.test
tests/net-yy-inet.test
tests/net-yy-netlink.test
tests/net-yy-unix.test
tests/net.test
tests/opipe.test
tests/poll.test
tests/prctl-seccomp-strict.test
tests/qual_fault-exit_group.test
tests/qual_fault.test
tests/qual_inject-error-signal.test
tests/qual_inject-retval.test
tests/qual_inject-signal.test
tests/qual_signal.test
tests/qual_syscall.test
tests/readv.test
tests/redirect-fds.test
tests/sched.test
tests/scm_rights-fd.test
tests/seccomp-strict.test
tests/strace-C.test
tests/strace-E.expected
tests/strace-E.test
tests/strace-S.test
tests/strace-T.test
tests/strace-V.test
tests/strace-ff.test
tests/strace-k.test
tests/strace-r.expected
tests/strace-r.test
tests/strace-t.test
tests/strace-tt.test
tests/strace-ttt.test
tests/sun_path.test
tests/uname.test
tests/unix-pair-send-recv.test
tests/unix-pair-sendto-recvfrom.test

index 477529d0d5195c4a5defcdfa6a1cc1a94f4f75e4..c21c09e199d5b02eab71d3a7d7d11b942a9d81c5 100644 (file)
@@ -1,9 +1,6 @@
+*.dir
 *.log
-*.log.*
 *.o
-*.tmp
-*.tmp-*
-*.tmp.*
 *.trs
 _newselect
 accept
index c6c28cc02e37298230690d0003c638ccd59a837d..acdb475a693ddd77b6eb0a36d070a1a81fe240d2 100644 (file)
@@ -968,6 +968,11 @@ ksysent.$(OBJEXT): ksysent.h
 objects = $(filter %.$(OBJEXT),$(SOURCES:.c=.$(OBJEXT)))
 $(objects): scno.h
 
-CLEANFILES = ksysent.h $(TESTS:=.tmp) $(TESTS:=.tmp.out) $(TESTS:=.tmp.exp)
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
+       -rm -rf -- $(TESTS:.test=.dir)
+
+CLEANFILES = ksysent.h
 
 include ../scno.am
index f41707409a75b8e372fe375992da43640617a3c3..e5a71acf11f8ab979979c66036f9ff0532faa10d 100755 (executable)
        framework_skip_ '/proc/self/task/ is not available'
 run_prog_skip_if_failed \
        kill -0 $$
-run_prog ./attach-f-p-cmd > /dev/null
+run_prog ../attach-f-p-cmd > /dev/null
 
 rm -f "$OUT"
-./set_ptracer_any sh -c "exec ./attach-f-p >> $OUT" > /dev/null &
+../set_ptracer_any sh -c "exec ../attach-f-p >> $OUT" > /dev/null &
 tracee_pid=$!
 
 while ! [ -s "$OUT" ]; do
@@ -45,6 +45,6 @@ while ! [ -s "$OUT" ]; do
                fail_ 'set_ptracer_any sh failed'
 done
 
-run_strace -a32 -f -echdir -p $tracee_pid ./attach-f-p-cmd > "$OUT"
+run_strace -a32 -f -echdir -p $tracee_pid ../attach-f-p-cmd > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"
index 2068cf1d2ed7a089bdbace3d7ac7fa889c46d644..b515eb81485c01062ebafeda1199c629d66aa87d 100755 (executable)
@@ -34,14 +34,14 @@ run_prog_skip_if_failed \
 
 rm -rf attach-p-cmd.test-lock
 rm -f "$OUT"
-./set_ptracer_any ./attach-p-cmd-p >> "$OUT" &
+../set_ptracer_any ../attach-p-cmd-p >> "$OUT" &
 tracee_pid=$!
 
 while ! [ -s "$OUT" ]; do
        kill -0 $tracee_pid 2> /dev/null ||
-               fail_ 'set_ptracer_any ./attach-p-cmd-p failed'
+               fail_ 'set_ptracer_any ../attach-p-cmd-p failed'
 done
 
-run_strace -a30 -echdir -p $tracee_pid ./attach-p-cmd-cmd > "$OUT"
+run_strace -a30 -echdir -p $tracee_pid ../attach-p-cmd-cmd > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"
index f1ab04f1f27baa689f817b6eaf0ef6aa969ebb17..631234eb3d200c875b2214c012c559c889801fea 100755 (executable)
@@ -35,14 +35,14 @@ run_strace_redir()
        $STRACE "$@" 2> "$LOG"
 }
 
-run_strace_redir -enone ./set_ptracer_any true ||
+run_strace_redir -enone ../set_ptracer_any true ||
        dump_log_and_fail_with "$STRACE $args: unexpected exit status"
 
-run_strace_redir -enone ./set_ptracer_any false
+run_strace_redir -enone ../set_ptracer_any false
 [ $? -eq 1 ] ||
        dump_log_and_fail_with "$STRACE $args: unexpected exit status"
 
-run_strace_redir -bexecve -enone ./set_ptracer_any false ||
+run_strace_redir -bexecve -enone ../set_ptracer_any false ||
        dump_log_and_fail_with "$STRACE $args: unexpected exit status"
 
 pattern_detached='[^:]*strace: Process [1-9][0-9]* detached'
index 1ee17b4b0f83090960b260087b72ee0788fecb17..03a7cd8ffe42c084797f51f8412d783f88e96557 100755 (executable)
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./btrfs -v > /dev/null
+run_prog ../btrfs -v > /dev/null
 run_strace -a16 -veioctl $args > "$EXP"
 check_prog grep
 grep -v '^ioctl([012],' < "$LOG" > "$OUT"
index c7e40ad71e0aa3d1e7afda1c3eafe4727590d499..d97c15bccfa3718e7b1de345cb4c334612f2cc4c 100755 (executable)
@@ -18,7 +18,7 @@ elif [ ! -d "${BTRFS_MOUNTPOINT}" ]; then
     skip_ "\$BTRFS_MOUNTPOINT does not point to a directory"
 fi
 
-run_prog ./btrfs -v -w "${BTRFS_MOUNTPOINT}" > /dev/null
+run_prog ../btrfs -v -w "${BTRFS_MOUNTPOINT}" > /dev/null
 run_strace -a16 -veioctl $args > "$EXP"
 check_prog grep
 grep -v '^ioctl([012],' < "$LOG" > "$OUT"
index 6238dca800aa6c70e3b68f14adce1ba2c1207602..1fa80469f8291243d3a22f2007fd3a82cdc971f0 100755 (executable)
@@ -18,7 +18,7 @@ elif [ ! -d "${BTRFS_MOUNTPOINT}" ]; then
     skip_ "\$BTRFS_MOUNTPOINT does not point to a directory"
 fi
 
-run_prog ./btrfs -w "${BTRFS_MOUNTPOINT}" > /dev/null
+run_prog ../btrfs -w "${BTRFS_MOUNTPOINT}" > /dev/null
 run_strace -a16 -eioctl $args > "$EXP"
 check_prog grep
 grep -v '^ioctl([012],' < "$LOG" > "$OUT"
index e75dc6b085e17f565bf8ba03aa4d5971ef4f90bc..31aa45dba5d52c2f27d90b2d28f9c5cf14fcf70e 100755 (executable)
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./sleep 0
+run_prog ../sleep 0
 check_prog grep
 
 grep_log()
 {
        local pattern="$1"; shift
 
-       run_strace "$@" ./sleep 1
+       run_strace "$@" ../sleep 1
 
        grep nanosleep "$LOG" > /dev/null ||
                framework_skip_ 'sleep does not use nanosleep'
index 006efb8591cf88c42ac6b3fd9322858457f2e234..af3783e8164e123620d5bd29ce894fddae1ca739 100755 (executable)
@@ -36,7 +36,7 @@ check_prog sleep
 
 set -e
 
-./set_ptracer_any sh -c "echo > $LOG; while :; do :; done" > /dev/null &
+../set_ptracer_any sh -c "echo > $LOG; while :; do :; done" > /dev/null &
 
 while ! [ -s "$LOG" ]; do
        kill -0 $! 2> /dev/null ||
index 54304f3113f2d6cbf072588f0db01f644359ae7f..fe6dc777f3bfcf6c1b67e3124e0458f422a25115 100755 (executable)
@@ -37,7 +37,7 @@ check_prog sleep
 set -e
 
 rm -f "$LOG"
-./set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" &
+../set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" &
 
 while ! [ -s "$LOG" ]; do
        kill -0 $! 2> /dev/null ||
index 8f480e7f7aec30b038fcccd0a8be6fe0f88e98d1..961f301966fff86aa35ba60d1687a6f9244ab86f 100755 (executable)
@@ -42,7 +42,7 @@ fi
 set -e
 
 rm -f "$LOG"
-./set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" &
+../set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" &
 
 while ! [ -s "$LOG" ]; do
        kill -0 $! 2> /dev/null ||
index 24a523e84c1ff79b1c2706a1dcce42635dd546a6..803fcd65e050c6ff70da5443cf2e2fd2bc462a3b 100644 (file)
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ME_="${0##*/}"
-LOG="$ME_.tmp"
-OUT="$LOG.out"
-EXP="$LOG.exp"
-NAME="${ME_%.test}"
+LOG="log"
+OUT="out"
+EXP="exp"
 
 warn_() { printf >&2 '%s\n' "$*"; }
 fail_() { warn_ "$ME_: failed test: $*"; exit 1; }
@@ -52,7 +51,7 @@ dump_log_and_fail_with()
 run_prog()
 {
        if [ $# -eq 0 ]; then
-               set -- "./$NAME"
+               set -- "../$NAME"
        fi
        args="$*"
        "$@" || {
@@ -267,17 +266,36 @@ grep_pid_status()
 check_prog cat
 check_prog rm
 
-rm -f "$LOG"
+case "$ME_" in
+       *.test)
+       NAME="${ME_%.test}"
+       TESTDIR="$NAME.dir"
+       rm -rf -- "$TESTDIR"
+       mkdir -- "$TESTDIR"
+       cd "$TESTDIR"
+
+       case "$srcdir" in
+               /*) ;;
+               *) srcdir="../$srcdir" ;;
+       esac
 
-[ -n "${STRACE-}" ] || {
-       STRACE=../strace
-       case "${LOG_COMPILER-} ${LOG_FLAGS-}" in
-               *--suppressions=*--error-exitcode=*--tool=*)
+       [ -n "${STRACE-}" ] || {
+               STRACE=../../strace
+               case "${LOG_COMPILER-} ${LOG_FLAGS-}" in
+                       *--suppressions=*--error-exitcode=*--tool=*)
                        # add valgrind command prefix
                        STRACE="${LOG_COMPILER-} ${LOG_FLAGS-} $STRACE"
                        ;;
-       esac
-}
+               esac
+       }
+
+               ;;
+
+       *)
+       [ -n "${STRACE-}" ] ||
+               STRACE=../strace
+       ;;
+esac
 
 : "${TIMEOUT_DURATION:=60}"
 : "${SLEEP_A_BIT:=sleep 1}"
index 0b87114a6e455e9c357ee64fe75b34210b947d6c..1ec43c352a2938e209e9993202838f093c3753b3 100755 (executable)
@@ -50,7 +50,7 @@ fi
 
 syscall=$mmap,madvise,mlockall,mprotect,mremap,msync,munmap
 
-run_prog "./$NAME" $mmap > /dev/null
+run_prog "../$NAME" $mmap > /dev/null
 run_strace -a20 -e$syscall $args > "$EXP"
 sed -n "/^$mmap(NULL, 0, PROT_NONE,/,\$p" < "$LOG" > "$OUT"
 match_diff "$OUT" "$EXP"
index aec8159fd088f90d41867db27821913483a45dac..bdc126e6cab9397c85465ae724631936ec16532c 100755 (executable)
@@ -36,7 +36,7 @@
 check_prog sed
 
 addr="$NAME-local-stream"
-run_prog "./$NAME" $addr > /dev/null
+run_prog "../$NAME" $addr > /dev/null
 
 run_strace -a20 -y -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.
index 2ebf91fa2b28e4d267be27ea87fdcc29e3ed2882..4bebac2504b938a0ab44d287ca167fe2bc24aabe 100755 (executable)
@@ -34,9 +34,9 @@
        framework_skip_ '/proc/self/fd/ is not available'
 
 check_prog sed
-run_prog ./netlink_inet_diag
+run_prog ../netlink_inet_diag
 
-run_prog "./$NAME" > /dev/null
+run_prog "../$NAME" > /dev/null
 
 run_strace -a22 -yy -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.
index bff1d8616040cf257761677217f14ac11e36e870..81e04dfe7d2276d7400200d99836ff03639e3b6e 100755 (executable)
@@ -37,9 +37,9 @@
        framework_skip_ '/proc/self/fd/ is not available'
 
 check_prog sed
-run_prog ./netlink_netlink_diag
+run_prog ../netlink_netlink_diag
 
-run_prog "./$NAME" > /dev/null
+run_prog "../$NAME" > /dev/null
 
 run_strace -a22 -yy -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.
index b82761c3420e6ce1de3fdf3225b8c81b5aa857b7..851b43ab2915f90bca4e061501b2745090d0e8d3 100755 (executable)
        framework_skip_ '/proc/self/fd/ is not available'
 
 check_prog sed
-run_prog ./netlink_unix_diag
+run_prog ../netlink_unix_diag
 
 addr="$NAME-local-stream"
-run_prog "./$NAME" $addr > /dev/null
+run_prog "../$NAME" $addr > /dev/null
 
 run_strace -a22 -yy -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.
index d8e6a73905a6ce9e9b9a0adea75cb8d8dbee3b2b..832070780f55dbad181b45084708f8c1ff2cf512 100755 (executable)
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./net-accept-connect net-local-stream
+run_prog ../net-accept-connect net-local-stream
 run_strace_merge -e%network $args
 match_grep
 
index 90e6838afbbebeecf4609dd1c2f7e209b9ef0c3c..f658687e59bbc0a91f3701af53ca0ee8dd11e13d 100755 (executable)
@@ -6,7 +6,7 @@
 
 check_prog grep
 run_prog grep chdir $srcdir/umovestr.expected > "$EXP"
-run_prog ./umovestr
+run_prog ../umovestr
 
 > "$LOG" || fail_ "failed to write $LOG"
 $STRACE -o "|cat > $LOG && $SLEEP_A_BIT && grep chdir < $LOG > $OUT" -e chdir $args ||
index b74be29e60e3eabf2673f541ebcc234202dbcb49..09b7c50df79468f6974ae2f2198f7b180e83c220 100755 (executable)
@@ -9,7 +9,7 @@ run_strace -a16 -vepoll $args > "$OUT"
 match_diff "$LOG" "$OUT"
 
 for abbrev in 0 1 2 3 4 5; do
-       run_prog "./$NAME" $abbrev > /dev/null
+       run_prog "../$NAME" $abbrev > /dev/null
        run_strace -a16 -epoll -s$abbrev $args > "$OUT"
        match_diff "$LOG" "$OUT"
 done
index 1f987df72156b149e0b91133841c1ef70600acf4..19a41e6ac2357d24859705784ca160310ee31823 100755 (executable)
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 check_prog grep
-set -- "./$NAME"
+set -- "../$NAME"
 "$@" > /dev/null || {
        case $? in
                77) skip_ "$* exited with code 77" ;;
index e589b754d8137e63451ab5669c08c6fee94428ed..36f233d9f9a82dbff1f835a69a07c83cee04eb2b 100755 (executable)
@@ -41,13 +41,13 @@ test_with()
        match_diff
 }
 
-test_with -eexit,exit_group -efault=exit_group:error=ENOSYS ./answer
+test_with -eexit,exit_group -efault=exit_group:error=ENOSYS ../answer
 
 test_with -eexit,exit_group -efault=exit_group:error=ENOSYS \
-         -efault=\!process:error=1 ./answer
+         -efault=\!process:error=1 ../answer
 
 test_with -eexit,exit_group -efault=all:error=ENOSYS \
-         -efault=exit:error=1:when=2+ ./answer
+         -efault=exit:error=1:when=2+ ../answer
 
 test_with -eexit,exit_group -efault=exit_group:error=ENOSYS \
-         -efault=\!%desc,%file,%memory,%process,%signal,%network,%ipc:error=1 ./answer
+         -efault=\!%desc,%file,%memory,%process,%signal,%network,%ipc:error=1 ../answer
index e194a78798fe788ae97d3db93aa9833ba491063e..49d93350f5acd2b197c885c2cecfb24ce779960c 100755 (executable)
@@ -76,7 +76,7 @@ check_fault_injection()
 
        run_strace -a11 -e trace=$trace \
                "$@" -e fault=$fault$when$error $extra \
-               ./$NAME $raw "$err" "$first" "$step" $N \
+               ../$NAME $raw "$err" "$first" "$step" $N \
                > "$EXP" 4> "$outexp" 5> "$outgot"
 
        match_diff "$EXP" "$LOG"
index fcbcc398fb9554717453c4caeb9d645394648e50..1fe46126da237769fb6233829ebca721a6cf9dbd 100755 (executable)
@@ -4,5 +4,5 @@
 . "${srcdir=.}/scno_tampering.sh"
 
 run_strace -a12 -echdir,exit_group -einject=chdir:error=ENOENT:signal=USR1 \
-       "./$NAME"
+       "../$NAME"
 match_diff
index 419030ad4d7e88001f52f31e43d6d348d2871805..4d55196de557c01c7a21b8f20d1caedc29b5ad24 100755 (executable)
@@ -12,7 +12,7 @@ check_injection()
        rval="$1"; shift
 
        run_strace -a12 -e$syscall -einject="$syscall:retval=$rval" "$@" \
-               ./qual_inject-retval "$rval" > "$EXP"
+               ../qual_inject-retval "$rval" > "$EXP"
        match_diff "$LOG" "$EXP"
        rm -f "$EXP"
 }
index 88002ce94b949253c9baf380d36a0e73d83c85dc..f17e5a0186a3520e42e695fb580c660c212d52e5 100755 (executable)
@@ -4,5 +4,5 @@
 . "${srcdir=.}/init.sh"
 
 run_strace -a12 -echdir,exit_group -einject=chdir:signal=USR1 \
-       ./$NAME
+       ../$NAME
 match_diff
index 54a37a30ca55396b2fb2882ddcdeacbb6a189154..eed18fd0849b584a269240cdb812085422234d5b 100755 (executable)
@@ -34,8 +34,8 @@ test_one_sig()
        local sigs
        sigs="$1"; shift
 
-       run_prog "./$NAME" "$@" > /dev/null
-       run_strace -e trace=none -e signal="$sigs" "./$NAME" "$@" > "$EXP"
+       run_prog "../$NAME" "$@" > /dev/null
+       run_strace -e trace=none -e signal="$sigs" "../$NAME" "$@" > "$EXP"
        match_diff "$LOG" "$EXP"
        rm -f "$EXP"
 }
index 23a9b627238d8dab08efd217300f9a28075f9eb5..e33fd044dc56b300b7cb11756f804f96cd1be9e9 100755 (executable)
@@ -5,17 +5,17 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./umovestr
-pattern_abbrev_verbose='execve("\./umovestr", \["\./umovestr"\], \[/\* [[:digit:]]* vars \*/\]) = 0'
-pattern_nonabbrev_verbose='execve("\./umovestr", \["\./umovestr"\], \[".*\"\(\.\.\.\)\?\]) = 0'
-pattern_nonverbose='execve("\./umovestr", 0x[[:xdigit:]]*, 0x[[:xdigit:]]*) = 0'
+run_prog ../umovestr
+pattern_abbrev_verbose='execve("\.\./umovestr", \["\.\./umovestr"\], \[/\* [[:digit:]]* vars \*/\]) = 0'
+pattern_nonabbrev_verbose='execve("\.\./umovestr", \["\.\./umovestr"\], \[".*\"\(\.\.\.\)\?\]) = 0'
+pattern_nonverbose='execve("\.\./umovestr", 0x[[:xdigit:]]*, 0x[[:xdigit:]]*) = 0'
 pattern_raw='execve(0x[[:xdigit:]]*, 0x[[:xdigit:]]*, 0x[[:xdigit:]]*) = 0'
 
 check_output_mismatch()
 {
        local pattern
        pattern="$1"; shift
-       run_strace "$@" ./umovestr
+       run_strace "$@" ../umovestr
        LC_ALL=C grep -x "$pattern" "$LOG" > /dev/null || {
                printf '%s\n%s\n' \
                        'Failed patterns of expected output:' "$pattern"
@@ -32,7 +32,7 @@ check_output_mismatch "$pattern_abbrev_verbose" -e trace=%process
 LC_ALL=C grep '^chdir' "$LOG" > /dev/null &&
        dump_log_and_fail_with "$STRACE $args unexpected output"
 
-run_strace -e 42 ./umovestr
+run_strace -e 42 ../umovestr
 LC_ALL=C grep '^[[:alnum:]_]*(' "$LOG" > /dev/null &&
        dump_log_and_fail_with "$STRACE $args unexpected output"
 
index dc187996f3e5e31ccfa93c09e0135692a000ae81..1623e2bf1ae8710b0be776ffd655f9375aa9707b 100755 (executable)
@@ -38,7 +38,7 @@ run_strace_match_diff -a16 -e trace=readv,writev \
 run_strace_match_diff -a16 -e trace=readv,writev \
        -eread='!all' -ewrite=none -eread='!0,1,2' -ewrite='!0,1,2'
 
-wfd="$(./print_maxfd)"
+wfd="$(../print_maxfd)"
 rfd="$(($wfd - 1))"
 run_strace_match_diff -a16 -e trace=readv,writev \
        -eread="$rfd" -ewrite="$wfd"
index ddef8fab13ab0d380c7e9211203c360bc51a18f9..6731f9480c18346a61b7715bf77b3d584e54e110 100755 (executable)
@@ -50,7 +50,7 @@ check_fd()
        touch "$LOG" "$fd0" ||
                framework_skip_ 'failed to create files'
 
-       set -- "\"./$NAME\"" "\"$1\"" "\"$2\"" "\"$3\""
+       set -- "\"../$NAME\"" "\"$1\"" "\"$2\"" "\"$3\""
        eval "$@" "<${a1:-&-}" ">${a2:-&-}" "2>${a3:-&-}" ||
                        fail_ "$* failed with code $rc"
 
index a62f7868a9fdbf2ff0c9696c8facec07d6797127..c65653a624d18af86a080d2d3b45418b05971d73 100755 (executable)
@@ -31,8 +31,8 @@
 
 while read w i
 do
-       try_run_prog "./$i" || continue
-       run_strace -a$w -e%sched ./$i > "$EXP"
+       try_run_prog "../$i" || continue
+       run_strace -a$w -e%sched ../$i > "$EXP"
        match_diff "$LOG" "$EXP"
 done << EOF
 28 sched_xetaffinity
@@ -48,8 +48,8 @@ echo '+++ exited with 0 +++' > "$EXP"
 
 while read w i
 do
-       try_run_prog "./$i" || continue
-       run_strace -a$w -e%sched ./$i > /dev/null
+       try_run_prog "../$i" || continue
+       run_strace -a$w -e%sched ../$i > /dev/null
        match_diff "$LOG" "$EXP"
 done << EOF
 11 fchdir
index ba34f6b0191987912ddaa4c80e4be025b7488e1c..767d2279cb8fc8e8baf75ed9a0992f412807a98a 100755 (executable)
@@ -48,7 +48,7 @@ file="$dir/$(for i in $(seq 1 127); do echo A; done; echo Z)"
 touch -- "$file" ||
        framework_skip_ 'failed to create a file'
 
-run_prog ./scm_rights /dev/zero
+run_prog ../scm_rights /dev/zero
 run_strace -y -x -e%network $args "$file"
 
 hex='[[:xdigit:]]'
index b354c6a2994915c7bd625fe481d176d80ff9fd27..0c290c64f2910b159f1ba3caf78a06e9b3bfe8e0 100755 (executable)
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-set -- "./$NAME"
+set -- "../$NAME"
 "$@" > /dev/null || {
        case $? in
                77) skip_ "$* exited with code 77" ;;
index ccca9a0918838f9d72c6469c7dc00ffeecdc8c46..359ddbde233019c10905107e127f76c18796b085 100755 (executable)
@@ -4,6 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./sleep 0
-run_strace -a24 -C -enanosleep ./sleep 1
+run_prog ../sleep 0
+run_strace -a24 -C -enanosleep ../sleep 1
 match_grep
index d7823b7a2c9dd08080d88f14e1b6a070bc981345..3ae2c28e80234d2a4c1a558732d48abc1a530ca7 100644 (file)
@@ -1 +1 @@
-execve\("\./sleep", \["\./sleep", "0"\], \[.*"option_E_var=OPTION_E_VAL".*\]\) = 0
+execve\("\.\./sleep", \["\.\./sleep", "0"\], \[.*"option_E_var=OPTION_E_VAL".*\]\) = 0
index d76ec3f5c5224b8490a2bb0c7694fca734fac758..843f27a9ad09a9da5676c6bc9339965632a6ac71 100755 (executable)
@@ -4,6 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./sleep 0 > /dev/null
+run_prog ../sleep 0 > /dev/null
 run_strace -E option_E_var=OPTION_E_VAL -v $args
 match_grep
index 3ea315cefc8be37b33fc088f91a79f6ed223eb96..ab077357366b59309bea37a94dba697c094e6638 100755 (executable)
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./readv > /dev/null
+run_prog ../readv > /dev/null
 
 test_c()
 {
@@ -13,7 +13,7 @@ test_c()
        sortopts="$1"; shift
        sedexpr="$1"; shift
 
-       run_strace -c -w -S "$sortby" ./readv > /dev/null
+       run_strace -c -w -S "$sortby" ../readv > /dev/null
        sed -r -n -e "$sedexpr" < "$LOG" > "$OUT"
 
        [ -s "$OUT" ] ||
index 7ab84a74371494f24d42c232cdd1ef75920ea0ca..a6dac4e6a0b89a45f9e5e8cd3da3e20de9b67a31 100755 (executable)
@@ -4,6 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./sleep 0
-run_strace -a24 -T -enanosleep ./sleep 1
+run_prog ../sleep 0
+run_strace -a24 -T -enanosleep ../sleep 1
 match_grep
index 9a051e00e248a0f6e0fd183ca02e787c3257305e..7d19fa16ea5843598433435306773d07394c629e 100755 (executable)
@@ -10,7 +10,8 @@ run_strace -V > "$LOG"
 
 getval()
 {
-       sed -r -n 's/#define[[:space:]]*'"$1"'[[:space:]]*"([^"]*)".*/\1/p' ../config.h
+       sed -r -n 's/#define[[:space:]]*'"$1"'[[:space:]]*"([^"]*)".*/\1/p' \
+               ../../config.h
 }
 
 cat > "$EXP" << __EOF__
index 2ce06f19dbc2db33326e9e5dcbf890320ded11f2..4f7327914c46433dab60f803d62a6739dfb8ea59 100755 (executable)
@@ -7,7 +7,7 @@
 run_prog_skip_if_failed \
        kill -0 $$
 
-./set_ptracer_any ./sleep 1 > "$OUT" &
+../set_ptracer_any ../sleep 1 > "$OUT" &
 tracee_pid=$!
 
 while ! [ -s "$OUT" ]; do
index d5e8ed2bc57d58591a7cdef82b632a2ebe0f5346..459aaca93f3db67a9b454d9c80a3421de4ba8faf 100755 (executable)
@@ -37,7 +37,7 @@
 check_prog sed
 check_prog tr
 
-run_prog ./stack-fcall
+run_prog ../stack-fcall
 run_strace -e getpid -k $args
 
 expected='getpid f3 f2 f1 f0 main '
index 8009c353cdbc53ddcb3a8882582f53037e26b3a2..a3d09079d82d594ba9374d2430656e3f1f10e452 100644 (file)
@@ -1,2 +1,2 @@
-[ ]{5}0\.0{6} execve\("\./sleep", \["\./sleep", "1"\], \[/\* [[:digit:]]+ vars \*/\]\) = 0
+[ ]{5}0\.0{6} execve\("\.\./sleep", \["\.\./sleep", "1"\], \[/\* [[:digit:]]+ vars \*/\]\) = 0
 [ ]{5}(1\.[01]|0\.9)[[:digit:]]{5} \+\+\+ exited with 0 \+\+\+
index 4ba01f12a121fcea501a5f77ff1bcb076feaf772..00649b560d19b34334c6787daa010c366fac1380 100755 (executable)
@@ -4,6 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./sleep 0
-run_strace -r -eexecve ./sleep 1
+run_prog ../sleep 0
+run_strace -r -eexecve ../sleep 1
 match_grep
index 1d213e639c0f128235f3df852b42d3e57ad65179..6ec9aa11922d733d9985ca1fd922bc9d10b92bde 100755 (executable)
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog_skip_if_failed date +%T > /dev/null
-run_prog ./sleep 0
+run_prog ../sleep 0
 
 t0="$(date +%T)"
 run_strace -t -eexecve $args
@@ -13,7 +13,7 @@ t1="$(date +%T)"
 
 EXPECTED="$LOG.expected"
 cat > "$EXPECTED" << __EOF__
-($t0|$t1) execve\\("\\./sleep", \\["\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
+($t0|$t1) execve\\("\\.\\./sleep", \\["\\.\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
 __EOF__
 
 match_grep "$LOG" "$EXPECTED"
index 3f80001eb6f3e7b40ca76465a6ee687fdbeb4ba8..36b0be9e804746e3ca7aad05d4bfd65a78d7e281 100755 (executable)
@@ -6,7 +6,7 @@
 
 run_prog_skip_if_failed date +%s > "$LOG"
 run_prog_skip_if_failed date +%T --date "@$(cat "$LOG")" > /dev/null
-run_prog ./sleep 0
+run_prog ../sleep 0
 
 s0="$(date +%s)"
 run_strace -tt -eexecve $args
@@ -21,7 +21,7 @@ while [ "$s" -le "$s1" ]; do
 done
 
 cat > "$EXP" << __EOF__
-($t_reg)\\.[[:digit:]]{6} execve\\("\\./sleep", \\["\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
+($t_reg)\\.[[:digit:]]{6} execve\\("\\.\\./sleep", \\["\\.\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
 __EOF__
 
 match_grep "$LOG" "$EXP"
index 4439715b5ce21e29db8387855c2b5fdb01420933..333b99c5376bfc0b0abf77dfde92a2b7a8f706a2 100755 (executable)
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog_skip_if_failed date +%s > /dev/null
-run_prog ./sleep 0
+run_prog ../sleep 0
 
 s0="$(date +%s)"
 run_strace -ttt -eexecve $args
@@ -19,7 +19,7 @@ while [ "$s" -le "$s1" ]; do
 done
 
 cat > "$EXP" << __EOF__
-($t_reg)\\.[[:digit:]]{6} execve\\("\\./sleep", \\["\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
+($t_reg)\\.[[:digit:]]{6} execve\\("\\.\\./sleep", \\["\\.\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
 __EOF__
 
 match_grep "$LOG" "$EXP"
index 728328a84fc9288efb234c75fcfd1955e0241ac2..f0b7a0263bd354e1ae60ca69cf613004df49f9e2 100755 (executable)
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./net-accept-connect 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678
+run_prog ../net-accept-connect 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678
 run_strace_merge -ebind,connect,getsockname $args
 match_grep
 
index 03fe30cd8be77f34c5615b65e7580554872f48de..24732e10d8ed920b79fe2f3536753950ee7539bf 100755 (executable)
@@ -10,7 +10,7 @@ run_prog > /dev/null
 run_strace -v -euname $args > "$EXP"
 uniq < "$LOG" > "$OUT"
 
-run_prog "./$NAME" abbrev > /dev/null
+run_prog "../$NAME" abbrev > /dev/null
 run_strace -euname $args >> "$EXP"
 uniq < "$LOG" >> "$OUT"
 
index 4defdebb7da42b9c8c749e6dabe8693a4f06ff30..10ab7ccc5956dca2274ad31eb34aba1b4ad839bc 100755 (executable)
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./unix-pair-send-recv abcdefghijklmnopqrstuvwxyz
+run_prog ../unix-pair-send-recv abcdefghijklmnopqrstuvwxyz
 run_strace -a32 -esignal=none -esend,recv -eread=0 -ewrite=0 $args
 match_diff
 
index 21afe236d8834a95b360d12008f42c2984cd8c44..0bd9a040fd29a3a165c2626a36203cc60161ea58 100755 (executable)
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./unix-pair-sendto-recvfrom abcdefghijklmnopqrstuvwxyz
+run_prog ../unix-pair-sendto-recvfrom abcdefghijklmnopqrstuvwxyz
 run_strace -esignal=none -esendto,recvfrom -eread=0 -ewrite=0 $args
 match_diff