The rseq selftests include two runner scripts run_param_test.sh and
run_syscall_errors_test.sh which set up the environment for test binaries
and run them with various parameters. Currently we list these test binaries
in TEST_GEN_PROGS but this results in the kselftest framework running them
directly as well as via the runners, resulting in duplication and spurious
failures when the environment is not correctly set up (eg, if glibc tries
to use rseq).

Move the binaries the runners invoke to TEST_GEN_PROGS_EXTENDED, binaries
listed there are built but not run by the framework.  The param_test
benchmarks are not moved since they are not run by run_param_test.sh.

Signed-off-by: Mark Brown <[email protected]>
---
 tools/testing/selftests/rseq/Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/rseq/Makefile 
b/tools/testing/selftests/rseq/Makefile
index 4ef90823b652..a217b959e036 100644
--- a/tools/testing/selftests/rseq/Makefile
+++ b/tools/testing/selftests/rseq/Makefile
@@ -14,12 +14,16 @@ LDLIBS += -lpthread -ldl
 # still track changes to header files and depend on shared object.
 OVERRIDE_TARGETS = 1
 
-TEST_GEN_PROGS = basic_test basic_percpu_ops_test basic_percpu_ops_mm_cid_test 
param_test \
-               param_test_benchmark param_test_compare_twice param_test_mm_cid 
\
-               param_test_mm_cid_benchmark param_test_mm_cid_compare_twice \
-               syscall_errors_test slice_test
-
-TEST_GEN_PROGS_EXTENDED = librseq.so
+TEST_GEN_PROGS = basic_test basic_percpu_ops_test basic_percpu_ops_mm_cid_test 
\
+               param_test_benchmark param_test_mm_cid_benchmark \
+               slice_test
+
+TEST_GEN_PROGS_EXTENDED = librseq.so \
+       param_test \
+       param_test_compare_twice \
+       param_test_mm_cid \
+       param_test_mm_cid_compare_twice \
+       syscall_errors_test
 
 TEST_PROGS = run_param_test.sh run_syscall_errors_test.sh
 

---
base-commit: 028ef9c96e96197026887c0f092424679298aae8
change-id: 20260423-selftests-rseq-use-runner-83867e4efc67

Best regards,
--  
Mark Brown <[email protected]>


Reply via email to