From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Wed, 19 Apr 2017 23:01:29 +0000 (+0200)
Subject: tests: use fixed name for stat tests sample file
X-Git-Tag: v4.17~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b266f3e9eb9e503b9ddfc4b6372196a3f643a7d7;p=strace

tests: use fixed name for stat tests sample file

As tests are now run in separate directories.

* tests/xstatx.c: Use fixed "stat.sample" name for sample file.
* tests/fstat.test: Use it as an argument for -P option.
* tests/gen_tests.in (fstat64, lstat, lstat64, newfstatat, oldlstat,
oldstat, stat, stat64, statx): Likewise.
---

diff --git a/tests/fstat.test b/tests/fstat.test
index 38936320..5f9ceb78 100755
--- a/tests/fstat.test
+++ b/tests/fstat.test
@@ -6,7 +6,7 @@
 
 syscall=$NAME
 run_prog > /dev/null
-sample=$syscall.sample
+sample=stat.sample
 > "$sample"
 run_strace -ve$syscall -P$sample -a21 $args > "$EXP"
 match_diff "$LOG" "$EXP"
diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index 3e885a24..1e55d09b 100644
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -77,7 +77,7 @@ finit_module	-a25
 flock	-a19
 fork-f	-a26 -qq -f -e signal=none -e trace=chdir
 fstat64	+fstat.test
-fstatat64	-a32 -v -P $NAME.sample -P /dev/full
+fstatat64	-a32 -v -P stat.sample -P /dev/full
 fstatfs	-a18
 fstatfs64	-a24
 fsync	-a10
@@ -149,8 +149,8 @@ lchown32	-a32
 link
 linkat
 lookup_dcookie	-a27
-lstat	-a32 -v -P $NAME.sample -P /dev/full
-lstat64	-a32 -v -P $NAME.sample -P /dev/full
+lstat	-a32 -v -P stat.sample -P /dev/full
+lstat64	-a32 -v -P stat.sample -P /dev/full
 mbind
 membarrier	-a36
 memfd_create
@@ -182,11 +182,11 @@ nanosleep	-a20
 net-icmp_filter	-e trace=getsockopt,setsockopt
 net-sockaddr	-a24 -e trace=connect
 netlink_protocol	-e trace=%network
-newfstatat	-a32 -v -P $NAME.sample -P /dev/full
+newfstatat	-a32 -v -P stat.sample -P /dev/full
 old_mmap	-a11 -e trace=mmap
 oldfstat	+fstat.test
-oldlstat	-a32 -v -P $NAME.sample -P /dev/full
-oldstat	-a32 -v -P $NAME.sample -P /dev/full
+oldlstat	-a32 -v -P stat.sample -P /dev/full
+oldstat	-a32 -v -P stat.sample -P /dev/full
 open	-a30 -P $NAME.sample
 openat	-P $NAME.sample
 osf_utimes	-a21
@@ -281,11 +281,11 @@ signalfd4
 sigreturn	-esignal='!USR1'
 socketcall	-a20
 splice
-stat	-a32 -v -P $NAME.sample -P /dev/full
-stat64	-a32 -v -P $NAME.sample -P /dev/full
+stat	-a32 -v -P stat.sample -P /dev/full
+stat64	-a32 -v -P stat.sample -P /dev/full
 statfs	-a17
 statfs64	-a23
-statx	-a32 -v -P $NAME.sample -P /dev/full
+statx	-a32 -v -P stat.sample -P /dev/full
 swap	-a23 -e trace=swapon,swapoff
 symlink	-a34
 symlinkat
diff --git a/tests/xstatx.c b/tests/xstatx.c
index 9b56deff..8d486ad5 100644
--- a/tests/xstatx.c
+++ b/tests/xstatx.c
@@ -272,7 +272,7 @@ main(void)
 # else
 	static const char full[] = "/dev/full";
 # endif
-	static const char sample[] = TEST_SYSCALL_STR ".sample";
+	static const char sample[] = "stat.sample";
 	TAIL_ALLOC_OBJECT_CONST_PTR(STRUCT_STAT, st);
 
 	int rc;