From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 30 Mar 2016 00:13:56 +0000 (+0000)
Subject: tests: introduce $NAME
X-Git-Tag: v4.12~475
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=579a4aae8ad1971d63579e62751b702c14dda180;p=strace

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 d4871b6f..cbe8ef6a 100755
--- 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 9c650199..506b4406 100755
--- 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 f01d147a..e69a4bdf 100644
--- 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 1725864a..0b87114a 100755
--- 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 2c503b8d..aec8159f 100755
--- 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 5ca2d7e5..8b19e566 100755
--- 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 2b5a67fb..b82761c3 100755
--- 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 86b6ce0c..ac891e3a 100755
--- 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 36147918..49ae4d13 100755
--- 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 b2cec03b..1834c1fc 100755
--- 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 5cd6f5d3..98389ee6 100755
--- 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 fbc82b1d..6e821150 100755
--- 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 2a1bbbd7..ae6d780f 100755
--- 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 99bfa264..6c2d0959 100755
--- 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 2e6c98d8..03fe30cd 100755
--- 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"