X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;fp=tests%2Fregression%2FMakefile.am;h=183fefe368fa1eb9e84f954e3ef792338f281c3d;hp=c7d102f089d0458e81974f0e5e16ab87e938df77;hb=03c5782e67a47b79fdd4013c8e0c68cdcb5a8228;hpb=3745305bf09e7825e75ee5b5490347ee67c6efdd

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index c7d102f..183fefe 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,13 +1,12 @@
 AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
 
-SCRIPT_LIST = run.sh
+TEST_EXTENSIONS = .tap
+TAP_LOG_DRIVER_FLAGS = --merge --comments
+TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
-
-dist_noinst_DATA = regression_tests.in
-
-noinst_PROGRAMS = test_urcu_fork \
-	rcutorture_urcu \
+noinst_PROGRAMS = test_urcu_fork.tap \
+	rcutorture_urcu_membarrier \
 	rcutorture_urcu_signal \
 	rcutorture_urcu_mb \
 	rcutorture_urcu_bp \
@@ -24,12 +23,12 @@ URCU_BP_LIB=$(top_builddir)/src/liburcu-bp.la
 URCU_CDS_LIB=$(top_builddir)/src/liburcu-cds.la
 TAP_LIB=$(top_builddir)/tests/utils/libtap.a
 
-test_urcu_fork_SOURCES = test_urcu_fork.c
-test_urcu_fork_LDADD = $(URCU_LIB) $(TAP_LIB)
+test_urcu_fork_tap_SOURCES = test_urcu_fork.c
+test_urcu_fork_tap_LDADD = $(URCU_LIB) $(TAP_LIB)
 
-rcutorture_urcu_SOURCES = urcutorture.c
-rcutorture_urcu_CFLAGS = -DRCU_MEMBARRIER $(AM_CFLAGS)
-rcutorture_urcu_LDADD = $(URCU_LIB) $(TAP_LIB)
+rcutorture_urcu_membarrier_SOURCES = urcutorture.c
+rcutorture_urcu_membarrier_CFLAGS = -DRCU_MEMBARRIER $(AM_CFLAGS)
+rcutorture_urcu_membarrier_LDADD = $(URCU_LIB) $(TAP_LIB)
 
 rcutorture_urcu_mb_SOURCES = urcutorture.c
 rcutorture_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS)
@@ -49,21 +48,73 @@ rcutorture_urcu_bp_LDADD = $(URCU_BP_LIB) $(TAP_LIB)
 
 urcutorture.c: ../common/api.h
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
-
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
-
 .PHONY: regtest
 
+# This empty variable is required to enable the TAP test suite for custom
+# targets like 'regtest' while keeping the default 'check' a noop.
+TESTS =
+
+REGTEST_TESTS = test_urcu_fork.tap \
+	rcutorture_urcu_bp_perf_global.tap \
+	rcutorture_urcu_bp_perf_percpu.tap \
+	rcutorture_urcu_bp_perf_perthread.tap \
+	rcutorture_urcu_bp_rperf_global.tap \
+	rcutorture_urcu_bp_rperf_percpu.tap \
+	rcutorture_urcu_bp_rperf_perthread.tap \
+	rcutorture_urcu_bp_stress_global.tap \
+	rcutorture_urcu_bp_stress_percpu.tap \
+	rcutorture_urcu_bp_stress_perthread.tap \
+	rcutorture_urcu_bp_uperf_global.tap \
+	rcutorture_urcu_bp_uperf_percpu.tap \
+	rcutorture_urcu_bp_uperf_perthread.tap \
+	rcutorture_urcu_mb_perf_global.tap \
+	rcutorture_urcu_mb_perf_percpu.tap \
+	rcutorture_urcu_mb_perf_perthread.tap \
+	rcutorture_urcu_mb_rperf_global.tap \
+	rcutorture_urcu_mb_rperf_percpu.tap \
+	rcutorture_urcu_mb_rperf_perthread.tap \
+	rcutorture_urcu_mb_stress_global.tap \
+	rcutorture_urcu_mb_stress_percpu.tap \
+	rcutorture_urcu_mb_stress_perthread.tap \
+	rcutorture_urcu_mb_uperf_global.tap \
+	rcutorture_urcu_mb_uperf_percpu.tap \
+	rcutorture_urcu_mb_uperf_perthread.tap \
+	rcutorture_urcu_membarrier_perf_global.tap \
+	rcutorture_urcu_membarrier_perf_percpu.tap \
+	rcutorture_urcu_membarrier_perf_perthread.tap \
+	rcutorture_urcu_membarrier_rperf_global.tap \
+	rcutorture_urcu_membarrier_rperf_percpu.tap \
+	rcutorture_urcu_membarrier_rperf_perthread.tap \
+	rcutorture_urcu_membarrier_stress_global.tap \
+	rcutorture_urcu_membarrier_stress_percpu.tap \
+	rcutorture_urcu_membarrier_stress_perthread.tap \
+	rcutorture_urcu_membarrier_uperf_global.tap \
+	rcutorture_urcu_membarrier_uperf_percpu.tap \
+	rcutorture_urcu_membarrier_uperf_perthread.tap \
+	rcutorture_urcu_qsbr_perf_global.tap \
+	rcutorture_urcu_qsbr_perf_percpu.tap \
+	rcutorture_urcu_qsbr_perf_perthread.tap \
+	rcutorture_urcu_qsbr_rperf_global.tap \
+	rcutorture_urcu_qsbr_rperf_percpu.tap \
+	rcutorture_urcu_qsbr_rperf_perthread.tap \
+	rcutorture_urcu_qsbr_stress_global.tap \
+	rcutorture_urcu_qsbr_stress_percpu.tap \
+	rcutorture_urcu_qsbr_stress_perthread.tap \
+	rcutorture_urcu_qsbr_uperf_global.tap \
+	rcutorture_urcu_qsbr_uperf_percpu.tap \
+	rcutorture_urcu_qsbr_uperf_perthread.tap \
+	rcutorture_urcu_signal_perf_global.tap \
+	rcutorture_urcu_signal_perf_percpu.tap \
+	rcutorture_urcu_signal_perf_perthread.tap \
+	rcutorture_urcu_signal_rperf_global.tap \
+	rcutorture_urcu_signal_rperf_percpu.tap \
+	rcutorture_urcu_signal_rperf_perthread.tap \
+	rcutorture_urcu_signal_stress_global.tap \
+	rcutorture_urcu_signal_stress_percpu.tap \
+	rcutorture_urcu_signal_stress_perthread.tap \
+	rcutorture_urcu_signal_uperf_global.tap \
+	rcutorture_urcu_signal_uperf_percpu.tap \
+	rcutorture_urcu_signal_uperf_perthread.tap
+
 regtest:
-	./run.sh regression_tests
+	$(MAKE) $(AM_MAKEFLAGS) check TESTS="$(REGTEST_TESTS)"