From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 1 Jan 2019 21:36:08 +0000 (+0000)
Subject: tests: fix strace-k.test on alpha
X-Git-Tag: v5.0~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cab745b84296231a7407595c2d8e61208c6e0b6f;p=strace

tests: fix strace-k.test on alpha

Change strace-k.test to use chdir syscall instead of getpid syscall
because the latter is not universally available, e.g. there is no getpid
syscall on alpha.

* tests/stack-fcall-3.c (f3) <default>: Replace getpid with chdir.
* tests/strace-k.test: Likewise.
* tests/strace-k.expected: Likewise.
* tests/strace-k-demangle.expected: Likewise.
* NEWS: Mention this.
---

diff --git a/NEWS b/NEWS
index db190a2d..616d594e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 Noteworthy changes in release ?.?? (????-??-??)
 ===============================================
 
+* Bug fixes
+  * Fixed strace-k test on alpha.
+
 Noteworthy changes in release 4.26 (2018-12-26)
 ===============================================
 
diff --git a/tests/stack-fcall-3.c b/tests/stack-fcall-3.c
index 3e0a705d..312da553 100644
--- a/tests/stack-fcall-3.c
+++ b/tests/stack-fcall-3.c
@@ -12,14 +12,12 @@
 
 int f3(int i)
 {
-	static int pid;
-
 	switch (i) {
 	case 1:
-		return kill(pid, SIGURG);
+		return kill(getpid(), SIGURG);
 
 	default:
-		return (pid = getpid()) + i;
+		return chdir("") + i;
 	}
 
 }
diff --git a/tests/strace-k-demangle.expected b/tests/strace-k-demangle.expected
index 54c6f50c..c1b48037 100644
--- a/tests/strace-k-demangle.expected
+++ b/tests/strace-k-demangle.expected
@@ -1,2 +1,2 @@
-^getpid .*(__kernel_vsyscall )?(__)?getpid ns::f3\(int\) ns::f2\(int\) ns::f1\(int\) ns::f0\(int\) main
+^chdir .*(__kernel_vsyscall )?(__)?chdir ns::f3\(int\) ns::f2\(int\) ns::f1\(int\) ns::f0\(int\) main
 ^SIGURG .*(__kernel_vsyscall )?(__)?kill ns::f3\(int\) ns::f2\(int\) ns::f1\(int\) ns::f0\(int\) main
diff --git a/tests/strace-k.expected b/tests/strace-k.expected
index e83ac955..e40c339e 100644
--- a/tests/strace-k.expected
+++ b/tests/strace-k.expected
@@ -1,2 +1,2 @@
-^getpid .*(__kernel_vsyscaln )?(__)?getpid f3 f2 f1 f0 main
+^chdir .*(__kernel_vsyscaln )?(__)?chdir f3 f2 f1 f0 main
 ^SIGURG .*(__kernel_vsyscaln )?(__)?kill f3 f2 f1 f0 main
diff --git a/tests/strace-k.test b/tests/strace-k.test
index 43fddb56..4fc8c6df 100755
--- a/tests/strace-k.test
+++ b/tests/strace-k.test
@@ -20,7 +20,7 @@ check_prog sed
 check_prog tr
 
 run_prog "${test_prog=../stack-fcall}"
-run_strace -e getpid -k $args
+run_strace -e chdir -k $args
 
 expected="$srcdir/$NAME.expected"
 awk '