Each test program lists $(TEST_GEN_PROGS_EXTENDED) as a prerequisite to
pick up librseq.so. Since that list also holds the test programs built by
the same rules, every build prints a page of
make: Circular <prog> <- <prog> dependency dropped.
Depend on $(OUTPUT)/librseq.so, which is what the rules need.
Fixes: cb48828f06afa ("selftests/rseq: Don't run tests with runner scripts
outside of the scripts")
Assisted-by: LLM
Signed-off-by: Sasha Levin <[email protected]>
---
tools/testing/selftests/rseq/Makefile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/rseq/Makefile
b/tools/testing/selftests/rseq/Makefile
index aba6317f6cb8e..977da558fa2f5 100644
--- a/tools/testing/selftests/rseq/Makefile
+++ b/tools/testing/selftests/rseq/Makefile
@@ -40,38 +40,38 @@ include ../lib.mk
$(OUTPUT)/librseq.so: rseq.c rseq.h rseq-*.h
$(CC) $(CFLAGS) -shared -fPIC $< $(LDLIBS) -o $@
-$(OUTPUT)/%: %.c $(TEST_GEN_PROGS_EXTENDED) rseq.h rseq-*.h
+$(OUTPUT)/%: %.c $(OUTPUT)/librseq.so rseq.h rseq-*.h
$(CC) $(CFLAGS) $< $(LDLIBS) -lrseq -o $@
-$(OUTPUT)/basic_percpu_ops_mm_cid_test: basic_percpu_ops_test.c
$(TEST_GEN_PROGS_EXTENDED) rseq.h rseq-*.h
+$(OUTPUT)/basic_percpu_ops_mm_cid_test: basic_percpu_ops_test.c
$(OUTPUT)/librseq.so rseq.h rseq-*.h
$(CC) $(CFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID $< $(LDLIBS) -lrseq -o $@
-$(OUTPUT)/param_test_benchmark: param_test.c $(TEST_GEN_PROGS_EXTENDED) \
+$(OUTPUT)/param_test_benchmark: param_test.c $(OUTPUT)/librseq.so \
rseq.h rseq-*.h
$(CC) $(CFLAGS) -DBENCHMARK $< $(LDLIBS) -lrseq -o $@
-$(OUTPUT)/param_test_compare_twice: param_test.c $(TEST_GEN_PROGS_EXTENDED) \
+$(OUTPUT)/param_test_compare_twice: param_test.c $(OUTPUT)/librseq.so \
rseq.h rseq-*.h
$(CC) $(CFLAGS) -DRSEQ_COMPARE_TWICE $< $(LDLIBS) -lrseq -o $@
-$(OUTPUT)/param_test_mm_cid: param_test.c $(TEST_GEN_PROGS_EXTENDED) \
+$(OUTPUT)/param_test_mm_cid: param_test.c $(OUTPUT)/librseq.so \
rseq.h rseq-*.h
$(CC) $(CFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID $< $(LDLIBS) -lrseq -o $@
-$(OUTPUT)/param_test_mm_cid_benchmark: param_test.c $(TEST_GEN_PROGS_EXTENDED)
\
+$(OUTPUT)/param_test_mm_cid_benchmark: param_test.c $(OUTPUT)/librseq.so \
rseq.h rseq-*.h
$(CC) $(CFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID -DBENCHMARK $< $(LDLIBS)
-lrseq -o $@
-$(OUTPUT)/param_test_mm_cid_compare_twice: param_test.c
$(TEST_GEN_PROGS_EXTENDED) \
+$(OUTPUT)/param_test_mm_cid_compare_twice: param_test.c $(OUTPUT)/librseq.so \
rseq.h rseq-*.h
$(CC) $(CFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID -DRSEQ_COMPARE_TWICE $<
$(LDLIBS) -lrseq -o $@
-$(OUTPUT)/syscall_errors_test: syscall_errors_test.c
$(TEST_GEN_PROGS_EXTENDED) \
+$(OUTPUT)/syscall_errors_test: syscall_errors_test.c $(OUTPUT)/librseq.so \
rseq.h rseq-*.h
$(CC) $(CFLAGS) $< $(LDLIBS) -lrseq -o $@
-$(OUTPUT)/slice_test: slice_test.c $(TEST_GEN_PROGS_EXTENDED) rseq.h rseq-*.h
+$(OUTPUT)/slice_test: slice_test.c $(OUTPUT)/librseq.so rseq.h rseq-*.h
$(CC) $(CFLAGS) $< $(LDLIBS) -lrseq -o $@
-$(OUTPUT)/check_optimized: check_optimized.c $(TEST_GEN_PROGS_EXTENDED) rseq.h
rseq-*.h
+$(OUTPUT)/check_optimized: check_optimized.c $(OUTPUT)/librseq.so rseq.h
rseq-*.h
$(CC) $(CFLAGS) $< $(LDLIBS) -lrseq -o $@
--
2.53.0
