From 23af76cc12958531f745b3e3c9f96565440f1416 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Fri, 29 Dec 2017 15:20:21 +0000
Subject: [PATCH] tests: parametrize strace-k.test

Prepare for the check of strace -k symbol names demangling.

* tests/strace-k.test: Parametrize $test_prog and $expected.
* tests/stack-fcall.h: New file.
* tests/stack-fcall.c: Include "stack-fcall.h"
* tests/stack-fcall-0.c: Likewise.
* tests/stack-fcall-1.c: Likewise.
* tests/stack-fcall-2.c: Likewise.
* tests/stack-fcall-3.c: Likewise.
* tests/Makefile.am (EXTRA_DIST): Add stack-fcall.h.
---
 tests/Makefile.am     | 1 +
 tests/stack-fcall-0.c | 2 +-
 tests/stack-fcall-1.c | 2 +-
 tests/stack-fcall-2.c | 2 +-
 tests/stack-fcall-3.c | 1 +
 tests/stack-fcall.c   | 2 +-
 tests/stack-fcall.h   | 4 ++++
 tests/strace-k.test   | 8 ++++----
 8 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 tests/stack-fcall.h

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3def7304..a6703e69 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -363,6 +363,7 @@ EXTRA_DIST = \
 	setugid.c \
 	sigaltstack.expected \
 	sockname.c \
+	stack-fcall.h \
 	strace-C.expected \
 	strace-E.expected \
 	strace-T.expected \
diff --git a/tests/stack-fcall-0.c b/tests/stack-fcall-0.c
index 12a260de..edd6d326 100644
--- a/tests/stack-fcall-0.c
+++ b/tests/stack-fcall-0.c
@@ -1,4 +1,4 @@
-int f1(int i);
+#include "stack-fcall.h"
 
 int f0(int i)
 {
diff --git a/tests/stack-fcall-1.c b/tests/stack-fcall-1.c
index 8716702d..5d0bf0e6 100644
--- a/tests/stack-fcall-1.c
+++ b/tests/stack-fcall-1.c
@@ -1,4 +1,4 @@
-int f2(int i);
+#include "stack-fcall.h"
 
 int f1(int i)
 {
diff --git a/tests/stack-fcall-2.c b/tests/stack-fcall-2.c
index 19f8cf83..e1643207 100644
--- a/tests/stack-fcall-2.c
+++ b/tests/stack-fcall-2.c
@@ -1,4 +1,4 @@
-int f3(int i);
+#include "stack-fcall.h"
 
 int f2(int i)
 {
diff --git a/tests/stack-fcall-3.c b/tests/stack-fcall-3.c
index 3af1667f..98726d8f 100644
--- a/tests/stack-fcall-3.c
+++ b/tests/stack-fcall-3.c
@@ -1,4 +1,5 @@
 #include <unistd.h>
+#include "stack-fcall.h"
 
 int f3(int i)
 {
diff --git a/tests/stack-fcall.c b/tests/stack-fcall.c
index fc9ee5f9..e0ec3b1a 100644
--- a/tests/stack-fcall.c
+++ b/tests/stack-fcall.c
@@ -1,4 +1,4 @@
-int f0(int i);
+#include "stack-fcall.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/stack-fcall.h b/tests/stack-fcall.h
new file mode 100644
index 00000000..afe0bfa8
--- /dev/null
+++ b/tests/stack-fcall.h
@@ -0,0 +1,4 @@
+int f0(int i);
+int f1(int i);
+int f2(int i);
+int f3(int i);
diff --git a/tests/strace-k.test b/tests/strace-k.test
index e68951e8..9d8934dd 100755
--- a/tests/strace-k.test
+++ b/tests/strace-k.test
@@ -38,10 +38,12 @@
 check_prog sed
 check_prog tr
 
-run_prog ../stack-fcall
+: ${test_prog=../stack-fcall}
+: ${expected='getpid f3 f2 f1 f0 main '}
+
+run_prog "$test_prog"
 run_strace -e getpid -k $args
 
-expected='getpid f3 f2 f1 f0 main '
 result=$(sed -r -n '1,/\(main\+0x[a-f0-9]+\) .*/ s/^.*\(([^+]+)\+0x[a-f0-9]+\) .*/\1/p' "$LOG" |
 	tr '\n' ' ')
 
@@ -50,5 +52,3 @@ test "$result" = "$expected" || {
 	echo "result: \"$result\""
 	dump_log_and_fail_with "$STRACE $args output mismatch"
 }
-
-exit 0
-- 
2.40.0