tests: robustify -k test

Split stack-fcall.c into several compilation units so that intermediate
function calls would not be optimized out by compiler.

* tests/stack-fcall.c: Move intermediate functions to ...
* tests/stack-fcall-*.c: ... new files.
* tests/Makefile.am (stack_fcall_SOURCES): Add stack-fcall-*.c.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index efe646db8847afdc11ea1346360296bae20770b9..922452abfd39db53b609593eb381bc857afe788c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,8 @@ check_PROGRAMS = \
        uio
 
 uio_CFLAGS = $(AM_CFLAGS) -D_FILE_OFFSET_BITS=64
+stack_fcall_SOURCES = stack-fcall.c \
+       stack-fcall-0.c stack-fcall-1.c stack-fcall-2.c stack-fcall-3.c
 
 TESTS = \
        ptrace_setoptions.test \

diff --git a/tests/stack-fcall-0.c b/tests/stack-fcall-0.c
new file mode 100644 (file)
index 0000000..12a260d
--- /dev/null
+++ b/tests/stack-fcall-0.c
@@ -0,0 +1,6 @@
+int f1(int i);
+
+int f0(int i)
+{
+       return f1(i) - i;
+}

diff --git a/tests/stack-fcall-1.c b/tests/stack-fcall-1.c
new file mode 100644 (file)
index 0000000..8716702
--- /dev/null
+++ b/tests/stack-fcall-1.c
@@ -0,0 +1,6 @@
+int f2(int i);
+
+int f1(int i)
+{
+       return f2(i) + i;
+}

diff --git a/tests/stack-fcall-2.c b/tests/stack-fcall-2.c
new file mode 100644 (file)
index 0000000..19f8cf8
--- /dev/null
+++ b/tests/stack-fcall-2.c
@@ -0,0 +1,6 @@
+int f3(int i);
+
+int f2(int i)
+{
+       return f3(i) - i;
+}

diff --git a/tests/stack-fcall-3.c b/tests/stack-fcall-3.c
new file mode 100644 (file)
index 0000000..3af1667
--- /dev/null
+++ b/tests/stack-fcall-3.c
@@ -0,0 +1,6 @@
+#include <unistd.h>
+
+int f3(int i)
+{
+       return getpid() + i;
+}

diff --git a/tests/stack-fcall.c b/tests/stack-fcall.c
index 7329bdc6799ad237a73012301aed5fb0fafd6312..134d54f610e0e493e9f6c329a138e62b8305fa31 100644 (file)
--- a/tests/stack-fcall.c
+++ b/tests/stack-fcall.c
@@ -1,35 +1,7 @@
-#include <unistd.h>
-#include <sys/types.h>
-
-/* Use "volatile" to avoid compiler optimization. */
-
-int f3(int i)
-{
-       static pid_t (* volatile g)(void) = getpid;
-       return g() + i;
-}
-
-int f2(volatile int i)
-{
-       static int (* volatile g)(int) = f3;
-       return g(i) - i;
-}
-
-int f1(volatile int i)
-{
-       static int (* volatile g)(int) = f2;
-       return g(i) + i;
-}
-
-int f0(volatile int i)
-{
-       static int (* volatile g)(int) = f1;
-       return g(i) - i;
-}
+int f0(int i);
 
 int main(int argc, char** argv)
 {
-       static int (* volatile g)(int) = f0;
-       g(argc);
+       f0(argc);
        return 0;
 }