tests: introduce $NAME

* tests/init.sh (NAME): New variable, defined to ${ME_%.test}.
(run_prog, match_awk, match_diff, match_grep): Replace ${ME_%.test}
with $NAME.
* tests/fcntl.test: Likewise.
* tests/fstat.test: Likewise.
* tests/mmap.test: Likewise.
* tests/net-y-unix.test: Likewise.
* tests/net-yy-inet.test: Likewise.
* tests/net-yy-unix.test: Likewise.
* tests/open.test: Likewise.
* tests/openat.test: Likewise.
* tests/poll.test: Likewise.
* tests/ppoll.test: Likewise.
* tests/readlink.test: Likewise.
* tests/select.test: Likewise.
* tests/statx.sh: Likewise.
* tests/uname.test: Likewise.

diff --git a/tests/fcntl.test b/tests/fcntl.test
index d4871b6f121c3a7b1e42d0966aafe3c273012443..cbe8ef6a0269a07337b8ae3a1ba98abcb5c214c6 100755 (executable)
--- a/tests/fcntl.test
+++ b/tests/fcntl.test
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-syscall=${ME_%.test}
+syscall=$NAME
 run_strace -a8 -e$syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/fstat.test b/tests/fstat.test
index 9c65019998c42748ef232faed37858adf0051f0e..506b4406b1421d2f84d4bf14169ac1cf524dce90 100755 (executable)
--- a/tests/fstat.test
+++ b/tests/fstat.test
@@ -8,7 +8,7 @@
 [ -d /proc/self/fd/ ] ||
        framework_skip_ '/proc/self/fd/ is not available'
 
-syscall=${ME_%.test}
+syscall=$NAME
 run_prog > /dev/null
 sample=$syscall.sample
 > "$sample"

diff --git a/tests/init.sh b/tests/init.sh
index f01d147a9a6d32ea4c80677d425fcfa48e806212..e69a4bdf21565974aff8d17d32d3886116747091 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -29,6 +29,7 @@ ME_="${0##*/}"
 LOG="$ME_.tmp"
 OUT="$LOG.out"
 EXP="$LOG.exp"
+NAME="${ME_%.test}"
 
 warn_() { printf >&2 '%s\n' "$*"; }
 fail_() { warn_ "$ME_: failed test: $*"; exit 1; }
@@ -51,7 +52,7 @@ dump_log_and_fail_with()
 run_prog()
 {
        if [ $# -eq 0 ]; then
-               set -- "./${ME_%.test}"
+               set -- "./$NAME"
        fi
        args="$*"
        "$@" || {
@@ -111,7 +112,7 @@ match_awk()
                output="$1"; shift
        fi
        if [ $# -eq 0 ]; then
-               program="$srcdir/${ME_%.test}.awk"
+               program="$srcdir/$NAME.awk"
        else
                program="$1"; shift
        fi
@@ -141,7 +142,7 @@ match_diff()
                output="$1"; shift
        fi
        if [ $# -eq 0 ]; then
-               expected="$srcdir/${ME_%.test}.expected"
+               expected="$srcdir/$NAME.expected"
        else
                expected="$1"; shift
        fi
@@ -171,7 +172,7 @@ match_grep()
                output="$1"; shift
        fi
        if [ $# -eq 0 ]; then
-               patterns="$srcdir/${ME_%.test}.expected"
+               patterns="$srcdir/$NAME.expected"
        else
                patterns="$1"; shift
        fi

diff --git a/tests/mmap.test b/tests/mmap.test
index 1725864aede6de9a91424c2c5e94e8b39903589c..0b87114a6e455e9c357ee64fe75b34210b947d6c 100755 (executable)
--- a/tests/mmap.test
+++ b/tests/mmap.test
@@ -50,7 +50,7 @@ fi
 
 syscall=$mmap,madvise,mlockall,mprotect,mremap,msync,munmap
 
-run_prog "./${ME_%.test}" $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"

diff --git a/tests/net-y-unix.test b/tests/net-y-unix.test
index 2c503b8d676cf6d4760ae236665a3ed16f2f3529..aec8159fd088f90d41867db27821913483a45dac 100755 (executable)
--- a/tests/net-y-unix.test
+++ b/tests/net-y-unix.test
@@ -35,8 +35,8 @@
 
 check_prog sed
 
-addr="${ME_%.test}-local-stream"
-run_prog "./${ME_%.test}" $addr > /dev/null
+addr="$NAME-local-stream"
+run_prog "./$NAME" $addr > /dev/null
 
 run_strace -a20 -y -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.

diff --git a/tests/net-yy-inet.test b/tests/net-yy-inet.test
index 5ca2d7e52bd76b2979a663dd6bf08458b127dd1d..8b19e5667a7588ef83b3de05c9e2b52585e9fe31 100755 (executable)
--- a/tests/net-yy-inet.test
+++ b/tests/net-yy-inet.test
@@ -36,8 +36,8 @@
 check_prog sed
 run_prog ./netlink_inet_diag
 
-addr="${ME_%.test}-local-stream"
-run_prog "./${ME_%.test}" $addr > /dev/null
+addr="$NAME-local-stream"
+run_prog "./$NAME" $addr > /dev/null
 
 run_strace -a22 -yy -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.

diff --git a/tests/net-yy-unix.test b/tests/net-yy-unix.test
index 2b5a67fb63433b1aab94f1abecce27012b79528c..b82761c3420e6ce1de3fdf3225b8c81b5aa857b7 100755 (executable)
--- a/tests/net-yy-unix.test
+++ b/tests/net-yy-unix.test
@@ -38,8 +38,8 @@
 check_prog sed
 run_prog ./netlink_unix_diag
 
-addr="${ME_%.test}-local-stream"
-run_prog "./${ME_%.test}" $addr > /dev/null
+addr="$NAME-local-stream"
+run_prog "./$NAME" $addr > /dev/null
 
 run_strace -a22 -yy -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.

diff --git a/tests/open.test b/tests/open.test
index 86b6ce0cd041199ddf79f40a54eefd0371e1cbbf..ac891e3abcb11acb7e9b115eccb40ffae1db6eb5 100755 (executable)
--- a/tests/open.test
+++ b/tests/open.test
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-syscall=${ME_%.test}
+syscall=$NAME
 sample=$syscall.sample
 run_strace -a30 -e$syscall -P$sample $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/openat.test b/tests/openat.test
index 3614791879ad44eae20be12b6c4bce834b0eb64b..49ae4d1365df75673c7208985e0775e2b459a627 100755 (executable)
--- a/tests/openat.test
+++ b/tests/openat.test
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-syscall=${ME_%.test}
+syscall=$NAME
 sample=$syscall.sample
 run_strace -e$syscall -P$sample $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/poll.test b/tests/poll.test
index b2cec03bf58e6f797efe7294fc1e7ee73e0b97f3..1834c1fc12d6ae55515fe38c596673e91b842405 100755 (executable)
--- a/tests/poll.test
+++ b/tests/poll.test
@@ -9,7 +9,7 @@ run_strace -a18 -vepoll $args > "$OUT"
 match_diff "$LOG" "$OUT"
 
 for abbrev in 0 1 2 3 4 5; do
-       run_prog "./${ME_%.test}" $abbrev > /dev/null
+       run_prog "./$NAME" $abbrev > /dev/null
        run_strace -a18 -epoll -s$abbrev $args > "$OUT"
        match_diff "$LOG" "$OUT"
 done

diff --git a/tests/ppoll.test b/tests/ppoll.test
index 5cd6f5d387330640e0d1f47608c66926ad569cc9..98389ee6e54a532274e445731fc56af27a31ecc0 100755 (executable)
--- a/tests/ppoll.test
+++ b/tests/ppoll.test
@@ -8,6 +8,6 @@ run_prog
 run_strace -a30 -s2 -e ppoll $args
 match_grep
 run_strace -a30 -v -s2 -e ppoll $args
-match_grep "$LOG" "$srcdir/${ME_%.test}-v.expected"
+match_grep "$LOG" "$srcdir/$NAME-v.expected"
 
 exit 0

diff --git a/tests/readlink.test b/tests/readlink.test
index fbc82b1d9d06b315c2b9ee605abb4d74a9350fbc..6e821150502c1bae7d48c66f6dab897a9fa24b3e 100755 (executable)
--- a/tests/readlink.test
+++ b/tests/readlink.test
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-syscall=${ME_%.test}
+syscall=$NAME
 run_prog > /dev/null
 run_strace -xx -e $syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/select.test b/tests/select.test
index 2a1bbbd722688ec8f3ed5c5c84545dbabf93c13a..ae6d780feb83690da58996f2fe5ac7a16e855ca9 100755 (executable)
--- a/tests/select.test
+++ b/tests/select.test
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-syscall=${ME_%.test}
+syscall=$NAME
 run_strace -a36 -e$syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"
 

diff --git a/tests/statx.sh b/tests/statx.sh
index 99bfa2645777d2568a3922e3a211e3ad7eb68d48..6c2d0959a8d84a9801926ef30ffec61335bd7754 100755 (executable)
--- a/tests/statx.sh
+++ b/tests/statx.sh
@@ -4,7 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
-syscall=${ME_%.test}
+syscall=$NAME
 run_prog > /dev/null
 run_strace -ve$syscall -P$syscall.sample $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/uname.test b/tests/uname.test
index 2e6c98d8b9daf2dd51f4feb39ecbe434377a45a4..03fe30cd8be77f34c5615b65e7580554872f48de 100755 (executable)
--- a/tests/uname.test
+++ b/tests/uname.test
@@ -10,7 +10,7 @@ run_prog > /dev/null
 run_strace -v -euname $args > "$EXP"
 uniq < "$LOG" > "$OUT"
 
-run_prog "./${ME_%.test}" abbrev > /dev/null
+run_prog "./$NAME" abbrev > /dev/null
 run_strace -euname $args >> "$EXP"
 uniq < "$LOG" >> "$OUT"