X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=b8d4acfe62d118e3f903f1932c3b11647bd31e37;hp=f41bd1add51c3658938783a2a02026ac058c2fd5;hb=153b081a9b007aad7bece415dc3bf1125edd2da3;hpb=35701ce90e66221d86429bc055ef585d8848c8d5

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index f41bd1a..b8d4acf 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -5,12 +5,19 @@ TAP_LOG_DRIVER_FLAGS = --merge --comments
 TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/tests/utils/tap-driver.sh
 
-noinst_PROGRAMS = test_urcu_fork.tap \
+noinst_PROGRAMS = \
+	test_urcu_fork.tap \
+	test_urcu_fork_cxx.tap \
 	rcutorture_urcu_membarrier \
+	rcutorture_urcu_membarrier_cxx \
 	rcutorture_urcu_signal \
+	rcutorture_urcu_signal_cxx \
 	rcutorture_urcu_mb \
+	rcutorture_urcu_mb_cxx \
 	rcutorture_urcu_bp \
-	rcutorture_urcu_qsbr
+	rcutorture_urcu_bp_cxx \
+	rcutorture_urcu_qsbr \
+	rcutorture_urcu_qsbr_cxx
 
 noinst_HEADERS = rcutorture.h
 
@@ -26,26 +33,49 @@ TAP_LIB=$(top_builddir)/tests/utils/libtap.a
 test_urcu_fork_tap_SOURCES = test_urcu_fork.c
 test_urcu_fork_tap_LDADD = $(URCU_LIB) $(TAP_LIB)
 
+test_urcu_fork_cxx_tap_SOURCES = test_urcu_fork_cxx.cpp
+test_urcu_fork_cxx_tap_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_membarrier_cxx_SOURCES = urcutorture_cxx.cpp
+rcutorture_urcu_membarrier_cxx_CXXFLAGS = -DRCU_MEMBARRIER $(AM_CXXFLAGS)
+rcutorture_urcu_membarrier_cxx_LDADD = $(URCU_LIB) $(TAP_LIB)
+
 rcutorture_urcu_mb_SOURCES = urcutorture.c
 rcutorture_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 rcutorture_urcu_mb_LDADD = $(URCU_MB_LIB)  $(TAP_LIB)
 
+rcutorture_urcu_mb_cxx_SOURCES = urcutorture_cxx.cpp
+rcutorture_urcu_mb_cxx_CXXFLAGS = -DRCU_MB $(AM_CXXFLAGS)
+rcutorture_urcu_mb_cxx_LDADD = $(URCU_MB_LIB)  $(TAP_LIB)
+
 rcutorture_urcu_qsbr_SOURCES = urcutorture.c
 rcutorture_urcu_qsbr_CFLAGS = -DTORTURE_QSBR -DRCU_QSBR $(AM_CFLAGS)
 rcutorture_urcu_qsbr_LDADD = $(URCU_QSBR_LIB) $(TAP_LIB)
 
+rcutorture_urcu_qsbr_cxx_SOURCES = urcutorture_cxx.cpp
+rcutorture_urcu_qsbr_cxx_CXXFLAGS = -DTORTURE_QSBR -DRCU_QSBR $(AM_CXXFLAGS)
+rcutorture_urcu_qsbr_cxx_LDADD = $(URCU_QSBR_LIB) $(TAP_LIB)
+
 rcutorture_urcu_signal_SOURCES = urcutorture.c
 rcutorture_urcu_signal_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
 rcutorture_urcu_signal_LDADD = $(URCU_SIGNAL_LIB) $(TAP_LIB)
 
+rcutorture_urcu_signal_cxx_SOURCES = urcutorture_cxx.cpp
+rcutorture_urcu_signal_cxx_CXXFLAGS = -DRCU_SIGNAL $(AM_CXXFLAGS)
+rcutorture_urcu_signal_cxx_LDADD = $(URCU_SIGNAL_LIB) $(TAP_LIB)
+
 rcutorture_urcu_bp_SOURCES = urcutorture.c
 rcutorture_urcu_bp_CFLAGS = -DRCU_BP $(AM_CFLAGS)
 rcutorture_urcu_bp_LDADD = $(URCU_BP_LIB) $(TAP_LIB)
 
+rcutorture_urcu_bp_cxx_SOURCES = urcutorture_cxx.cpp
+rcutorture_urcu_bp_cxx_CXXFLAGS = -DRCU_BP $(AM_CXXFLAGS)
+rcutorture_urcu_bp_cxx_LDADD = $(URCU_BP_LIB) $(TAP_LIB)
+
 urcutorture.c: ../common/api.h
 
 .PHONY: regtest
@@ -54,67 +84,129 @@ urcutorture.c: ../common/api.h
 # targets like 'regtest' while keeping the default 'check' a noop.
 TESTS =
 
-REGTEST_TESTS = test_urcu_fork.tap \
+REGTEST_TESTS = \
+	test_urcu_fork.tap \
+	test_urcu_fork_cxx.tap \
 	rcutorture_urcu_bp_perf_global.tap \
+	rcutorture_urcu_bp_perf_global_cxx.tap \
 	rcutorture_urcu_bp_perf_percpu.tap \
+	rcutorture_urcu_bp_perf_percpu_cxx.tap \
 	rcutorture_urcu_bp_perf_perthread.tap \
+	rcutorture_urcu_bp_perf_perthread_cxx.tap \
 	rcutorture_urcu_bp_rperf_global.tap \
+	rcutorture_urcu_bp_rperf_global_cxx.tap \
 	rcutorture_urcu_bp_rperf_percpu.tap \
+	rcutorture_urcu_bp_rperf_percpu_cxx.tap \
 	rcutorture_urcu_bp_rperf_perthread.tap \
+	rcutorture_urcu_bp_rperf_perthread_cxx.tap \
 	rcutorture_urcu_bp_stress_global.tap \
+	rcutorture_urcu_bp_stress_global_cxx.tap \
 	rcutorture_urcu_bp_stress_percpu.tap \
+	rcutorture_urcu_bp_stress_percpu_cxx.tap \
 	rcutorture_urcu_bp_stress_perthread.tap \
+	rcutorture_urcu_bp_stress_perthread_cxx.tap \
 	rcutorture_urcu_bp_uperf_global.tap \
+	rcutorture_urcu_bp_uperf_global_cxx.tap \
 	rcutorture_urcu_bp_uperf_percpu.tap \
+	rcutorture_urcu_bp_uperf_percpu_cxx.tap \
 	rcutorture_urcu_bp_uperf_perthread.tap \
+	rcutorture_urcu_bp_uperf_perthread_cxx.tap \
 	rcutorture_urcu_mb_perf_global.tap \
+	rcutorture_urcu_mb_perf_global_cxx.tap \
 	rcutorture_urcu_mb_perf_percpu.tap \
+	rcutorture_urcu_mb_perf_percpu_cxx.tap \
 	rcutorture_urcu_mb_perf_perthread.tap \
+	rcutorture_urcu_mb_perf_perthread_cxx.tap \
 	rcutorture_urcu_mb_rperf_global.tap \
+	rcutorture_urcu_mb_rperf_global_cxx.tap \
 	rcutorture_urcu_mb_rperf_percpu.tap \
+	rcutorture_urcu_mb_rperf_percpu_cxx.tap \
 	rcutorture_urcu_mb_rperf_perthread.tap \
+	rcutorture_urcu_mb_rperf_perthread_cxx.tap \
 	rcutorture_urcu_mb_stress_global.tap \
+	rcutorture_urcu_mb_stress_global_cxx.tap \
 	rcutorture_urcu_mb_stress_percpu.tap \
+	rcutorture_urcu_mb_stress_percpu_cxx.tap \
 	rcutorture_urcu_mb_stress_perthread.tap \
+	rcutorture_urcu_mb_stress_perthread_cxx.tap \
 	rcutorture_urcu_mb_uperf_global.tap \
+	rcutorture_urcu_mb_uperf_global_cxx.tap \
 	rcutorture_urcu_mb_uperf_percpu.tap \
+	rcutorture_urcu_mb_uperf_percpu_cxx.tap \
 	rcutorture_urcu_mb_uperf_perthread.tap \
+	rcutorture_urcu_mb_uperf_perthread_cxx.tap \
 	rcutorture_urcu_membarrier_perf_global.tap \
+	rcutorture_urcu_membarrier_perf_global_cxx.tap \
 	rcutorture_urcu_membarrier_perf_percpu.tap \
+	rcutorture_urcu_membarrier_perf_percpu_cxx.tap \
 	rcutorture_urcu_membarrier_perf_perthread.tap \
+	rcutorture_urcu_membarrier_perf_perthread_cxx.tap \
 	rcutorture_urcu_membarrier_rperf_global.tap \
+	rcutorture_urcu_membarrier_rperf_global_cxx.tap \
 	rcutorture_urcu_membarrier_rperf_percpu.tap \
+	rcutorture_urcu_membarrier_rperf_percpu_cxx.tap \
 	rcutorture_urcu_membarrier_rperf_perthread.tap \
+	rcutorture_urcu_membarrier_rperf_perthread_cxx.tap \
 	rcutorture_urcu_membarrier_stress_global.tap \
+	rcutorture_urcu_membarrier_stress_global_cxx.tap \
 	rcutorture_urcu_membarrier_stress_percpu.tap \
+	rcutorture_urcu_membarrier_stress_percpu_cxx.tap \
 	rcutorture_urcu_membarrier_stress_perthread.tap \
+	rcutorture_urcu_membarrier_stress_perthread_cxx.tap \
 	rcutorture_urcu_membarrier_uperf_global.tap \
+	rcutorture_urcu_membarrier_uperf_global_cxx.tap \
 	rcutorture_urcu_membarrier_uperf_percpu.tap \
+	rcutorture_urcu_membarrier_uperf_percpu_cxx.tap \
 	rcutorture_urcu_membarrier_uperf_perthread.tap \
+	rcutorture_urcu_membarrier_uperf_perthread_cxx.tap \
 	rcutorture_urcu_qsbr_perf_global.tap \
+	rcutorture_urcu_qsbr_perf_global_cxx.tap \
 	rcutorture_urcu_qsbr_perf_percpu.tap \
+	rcutorture_urcu_qsbr_perf_percpu_cxx.tap \
 	rcutorture_urcu_qsbr_perf_perthread.tap \
+	rcutorture_urcu_qsbr_perf_perthread_cxx.tap \
 	rcutorture_urcu_qsbr_rperf_global.tap \
+	rcutorture_urcu_qsbr_rperf_global_cxx.tap \
 	rcutorture_urcu_qsbr_rperf_percpu.tap \
+	rcutorture_urcu_qsbr_rperf_percpu_cxx.tap \
 	rcutorture_urcu_qsbr_rperf_perthread.tap \
+	rcutorture_urcu_qsbr_rperf_perthread_cxx.tap \
 	rcutorture_urcu_qsbr_stress_global.tap \
+	rcutorture_urcu_qsbr_stress_global_cxx.tap \
 	rcutorture_urcu_qsbr_stress_percpu.tap \
+	rcutorture_urcu_qsbr_stress_percpu_cxx.tap \
 	rcutorture_urcu_qsbr_stress_perthread.tap \
+	rcutorture_urcu_qsbr_stress_perthread_cxx.tap \
 	rcutorture_urcu_qsbr_uperf_global.tap \
+	rcutorture_urcu_qsbr_uperf_global_cxx.tap \
 	rcutorture_urcu_qsbr_uperf_percpu.tap \
+	rcutorture_urcu_qsbr_uperf_percpu_cxx.tap \
 	rcutorture_urcu_qsbr_uperf_perthread.tap \
+	rcutorture_urcu_qsbr_uperf_perthread_cxx.tap \
 	rcutorture_urcu_signal_perf_global.tap \
+	rcutorture_urcu_signal_perf_global_cxx.tap \
 	rcutorture_urcu_signal_perf_percpu.tap \
+	rcutorture_urcu_signal_perf_percpu_cxx.tap \
 	rcutorture_urcu_signal_perf_perthread.tap \
+	rcutorture_urcu_signal_perf_perthread_cxx.tap \
 	rcutorture_urcu_signal_rperf_global.tap \
+	rcutorture_urcu_signal_rperf_global_cxx.tap \
 	rcutorture_urcu_signal_rperf_percpu.tap \
+	rcutorture_urcu_signal_rperf_percpu_cxx.tap \
 	rcutorture_urcu_signal_rperf_perthread.tap \
+	rcutorture_urcu_signal_rperf_perthread_cxx.tap \
 	rcutorture_urcu_signal_stress_global.tap \
+	rcutorture_urcu_signal_stress_global_cxx.tap \
 	rcutorture_urcu_signal_stress_percpu.tap \
+	rcutorture_urcu_signal_stress_percpu_cxx.tap \
 	rcutorture_urcu_signal_stress_perthread.tap \
+	rcutorture_urcu_signal_stress_perthread_cxx.tap \
 	rcutorture_urcu_signal_uperf_global.tap \
+	rcutorture_urcu_signal_uperf_global_cxx.tap \
 	rcutorture_urcu_signal_uperf_percpu.tap \
-	rcutorture_urcu_signal_uperf_perthread.tap
+	rcutorture_urcu_signal_uperf_percpu_cxx.tap \
+	rcutorture_urcu_signal_uperf_perthread.tap \
+	rcutorture_urcu_signal_uperf_perthread_cxx.tap
 
 regtest:
 	$(MAKE) $(AM_MAKEFLAGS) check TESTS="$(REGTEST_TESTS)"