From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 29 Mar 2021 03:29:42 +0000 (-0700)
Subject: memcheck/tests/linux/stack_changes: Only run this test if setcontext() is available
X-Git-Tag: VALGRIND_3_18_0~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd4d78163fa2a1874046290e0384c4704899f2d;p=thirdparty%2Fvalgrind.git

memcheck/tests/linux/stack_changes: Only run this test if setcontext() is available

See also https://bugs.kde.org/show_bug.cgi?id=434775 .
---

diff --git a/configure.ac b/configure.ac
index 7262a98262..14a01ab7b5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4403,6 +4403,7 @@ AC_CHECK_FUNCS([     \
         pwritev2     \
         readlinkat   \
         semtimedop   \
+        setcontext   \
         signalfd     \
         sigwaitinfo  \
         strchr       \
@@ -4434,6 +4435,7 @@ AM_CONDITIONAL([HAVE_PREADV_PWRITEV],
                [test x$ac_cv_func_preadv = xyes && test x$ac_cv_func_pwritev = xyes])
 AM_CONDITIONAL([HAVE_PREADV2_PWRITEV2],
                [test x$ac_cv_func_preadv2 = xyes && test x$ac_cv_func_pwritev2 = xyes])
+AM_CONDITIONAL([HAVE_SETCONTEXT], [test x$ac_cv_func_setcontext = xyes])
 AM_CONDITIONAL([HAVE_SWAPCONTEXT], [test x$ac_cv_func_swapcontext = xyes])
 AM_CONDITIONAL([HAVE_MEMFD_CREATE],
                [test x$ac_cv_func_memfd_create = xyes])
diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index f7cf5a456c..4f0d838434 100644
--- a/memcheck/tests/linux/Makefile.am
+++ b/memcheck/tests/linux/Makefile.am
@@ -47,7 +47,6 @@ check_PROGRAMS = \
 	lsframe2 \
 	rfcomm \
 	sigqueue \
-	stack_changes \
 	stack_switch \
 	syscalls-2007 \
 	syslog-syscall \
@@ -78,6 +77,10 @@ if HAVE_PREADV2_PWRITEV2
         check_PROGRAMS += sys-preadv2_pwritev2
 endif
 
+if HAVE_SETCONTEXT
+        check_PROGRAMS += stack_changes
+endif
+
 AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
 AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
diff --git a/memcheck/tests/linux/stack_changes.vgtest b/memcheck/tests/linux/stack_changes.vgtest
index fa3c737066..62e9f81355 100644
--- a/memcheck/tests/linux/stack_changes.vgtest
+++ b/memcheck/tests/linux/stack_changes.vgtest
@@ -1,2 +1,3 @@
+prereq: test -e stack_changes
 prog: stack_changes
 vgopts: -q