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. Fixes: 830969e7821a ("selftests/rseq: Implement time slice extension test")
Unified · Split
| @@ -14,12 +14,15 @@ LDLIBS += -lpthread -ldl · 13 unmodified lines | |||
| 14 | # still track changes to header files and depend on shared object. | 14 | # still track changes to header files and depend on shared object. |
| 15 | OVERRIDE_TARGETS = 1 | 15 | OVERRIDE_TARGETS = 1 |
| 16 | 16 | ||
| 17 | TEST_GEN_PROGS = basic_test basic_percpu_ops_test basic_percpu_ops_mm_cid_test param_test \ | 17 | TEST_GEN_PROGS = basic_test basic_percpu_ops_test basic_percpu_ops_mm_cid_test \ |
| 18 | param_test_benchmark param_test_compare_twice param_test_mm_cid \ | 18 | param_test_benchmark param_test_mm_cid_benchmark slice_test |
| 19 | param_test_mm_cid_benchmark param_test_mm_cid_compare_twice \ | 19 | |
| 20 | syscall_errors_test slice_test | 20 | TEST_GEN_PROGS_EXTENDED = librseq.so \ |
| 21 | 21 | param_test \ | |
| 22 | TEST_GEN_PROGS_EXTENDED = librseq.so | 22 | param_test_compare_twice \ |
| 23 | param_test_mm_cid \ | ||
| 24 | param_test_mm_cid_compare_twice \ | ||
| 25 | syscall_errors_test | ||
| 23 | 26 | ||
| 24 | TEST_PROGS = run_param_test.sh run_syscall_errors_test.sh | 27 | TEST_PROGS = run_param_test.sh run_syscall_errors_test.sh |
| 25 | 28 | ||