X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fbenchmark%2FMakefile.am;h=c53e02587d80bad0f71eb1afb929627b1ea44aa7;hb=de6cb9d58c9d654b3e375835faf1f84294315cdd;hp=2326721ac4577aae8420da955d147b19363fb2ad;hpb=2ea58a693a53eff9c07ae6a683671cf0bf79415f;p=urcu.git

diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index 2326721..c53e025 100644
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -1,13 +1,13 @@
-if !LIBC_INCLUDES_PTHREAD
-AM_LDFLAGS=-lpthread
-endif
-AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/tests/common
 
-SCRIPT_LIST = common.sh \
-	run.sh \
-	run-urcu-tests.sh \
-	runhash.sh \
-	runtests.sh \
+TEST_EXTENSIONS = .tap
+TAP_LOG_DRIVER_FLAGS = --merge --comments
+TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
+	URCU_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \
+	URCU_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \
+	$(SHELL) $(top_srcdir)/tests/utils/tap-driver.sh
+
+SCRIPT_LIST = \
 	runpaul-phase1.sh \
 	runpaul-phase2.sh \
 	runpaul-phase3.sh \
@@ -15,16 +15,22 @@ SCRIPT_LIST = common.sh \
 	runpaul-phase5.sh \
 	runpaul-phase6.sh \
 	runpaul-phase7.sh \
-	runtests-batch.sh \
 	subphase4.sh
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
-
-TEST_LIST = regression_tests \
-	short_bench_tests \
-	long_bench_tests
+dist_noinst_SCRIPTS = \
+	runhash.sh \
+	runtests-batch.sh \
+	runtests.sh \
+	run-urcu-tests.sh \
+	$(SCRIPT_LIST)
 
-dist_noinst_DATA = $(TEST_LIST)
+dist_noinst_DATA = \
+	hashtable_1_seconds.tap \
+	urcu_1_seconds.tap
+	hashtable_3_seconds.tap \
+	urcu_3_seconds.tap
+	hashtable_30_seconds.tap \
+	urcu_30_seconds.tap
 
 noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
 	test_urcu_signal test_urcu_signal_dynamic_link test_urcu_signal_timing \
@@ -45,13 +51,13 @@ noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
 	test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash \
 	test_urcu_lfs_rcu_dynlink
 
-URCU_COMMON_LIB=$(top_builddir)/liburcu-common.la
-URCU_LIB=$(top_builddir)/liburcu.la
-URCU_QSBR_LIB=$(top_builddir)/liburcu-qsbr.la
-URCU_MB_LIB=$(top_builddir)/liburcu-mb.la
-URCU_SIGNAL_LIB=$(top_builddir)/liburcu-signal.la
-URCU_BP_LIB=$(top_builddir)/liburcu-bp.la
-URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la
+URCU_COMMON_LIB=$(top_builddir)/src/liburcu-common.la
+URCU_LIB=$(top_builddir)/src/liburcu.la
+URCU_QSBR_LIB=$(top_builddir)/src/liburcu-qsbr.la
+URCU_MB_LIB=$(top_builddir)/src/liburcu-mb.la
+URCU_SIGNAL_LIB=$(top_builddir)/src/liburcu-signal.la
+URCU_BP_LIB=$(top_builddir)/src/liburcu-bp.la
+URCU_CDS_LIB=$(top_builddir)/src/liburcu-cds.la
 
 DEBUG_YIELD_LIB=$(builddir)/../common/libdebug-yield.la
 
@@ -217,25 +223,33 @@ test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_COMMON_LIB) $(URCU_CDS_LIB)
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST) $(TEST_LIST); do \
+		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) $(TEST_LIST); do \
+		for script in $(SCRIPT_LIST); do \
 			rm -f $(builddir)/$$script; \
 		done; \
 	fi
 
 .PHONY: short_bench long_bench 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 =
+
+SHORT_BENCH_TESTS = urcu_3_seconds.tap hashtable_3_seconds.tap
+LONG_BENCH_TESTS = urcu_30_seconds.tap hashtable_30_seconds.tap
+REGTEST_TESTS = urcu_1_seconds.tap hashtable_1_seconds.tap
+
 short_bench:
-	./run.sh short_bench_tests
+	$(MAKE) $(AM_MAKEFLAGS) check TESTS="$(SHORT_BENCH_TESTS)"
 
 long_bench:
-	./run.sh long_bench_tests
+	$(MAKE) $(AM_MAKEFLAGS) check TESTS="$(LONG_BENCH_TESTS)"
 
 regtest:
-	./run.sh regression_tests
+	$(MAKE) $(AM_MAKEFLAGS) check TESTS="$(REGTEST_TESTS)"