X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=233fdbd2328de6cb4452b051169ce5c02bf0a49d;hp=54eb9f36e99015024872a662afd1da1b7a549b7e;hb=4de89c1129d52f0f13b63ec037802e095c506875;hpb=6893800a4d1cc14dff0395ddcd660a5138db183d

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 54eb9f3..233fdbd 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,12 +1,68 @@
-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
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common
 
-SCRIPT_LIST = test_loop run.sh unit_tests
+LOG_DRIVER_FLAGS = --merge --comments
+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
 
-noinst_PROGRAMS = test_uatomic \
+noinst_PROGRAMS = \
+	get_cpu_mask_from_sysfs \
+	get_cpu_mask_from_sysfs_cxx \
+	get_max_cpuid_from_sysfs \
+	get_max_cpuid_from_sysfs_cxx \
+	test_arch \
+	test_arch_cxx \
+	test_get_max_cpuid_from_mask \
+	test_get_max_cpuid_from_mask_cxx \
+	test_get_possible_cpus_array_len \
+	test_get_possible_cpus_array_len_cxx \
+	test_uatomic \
+	test_uatomic_cxx \
 	test_urcu_multiflavor \
-	test_urcu_multiflavor_dynlink
+	test_urcu_multiflavor_cxx \
+	test_urcu_multiflavor_dynlink \
+	test_urcu_multiflavor_dynlink_cxx \
+	test_urcu_multiflavor_single_unit \
+	test_urcu_multiflavor_single_unit_cxx \
+	test_urcu_multiflavor_single_unit_dynlink \
+	test_urcu_multiflavor_single_unit_dynlink_cxx \
+	test_build \
+	test_build_cxx \
+	test_build_dynlink \
+	test_build_dynlink_cxx
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+dist_noinst_SCRIPTS = \
+	test_get_cpu_mask_from_sysfs \
+	test_get_cpu_mask_from_sysfs_cxx \
+	test_get_max_cpuid_from_sysfs \
+	test_get_max_cpuid_from_sysfs_cxx
+
+TESTS = \
+	test_arch \
+	test_arch_cxx \
+	test_get_cpu_mask_from_sysfs \
+	test_get_cpu_mask_from_sysfs_cxx \
+	test_get_max_cpuid_from_mask \
+	test_get_max_cpuid_from_mask_cxx \
+	test_get_max_cpuid_from_sysfs \
+	test_get_max_cpuid_from_sysfs_cxx \
+	test_get_possible_cpus_array_len \
+	test_get_possible_cpus_array_len_cxx \
+	test_uatomic \
+	test_uatomic_cxx \
+	test_urcu_multiflavor \
+	test_urcu_multiflavor_cxx \
+	test_urcu_multiflavor_dynlink \
+	test_urcu_multiflavor_dynlink_cxx \
+	test_urcu_multiflavor_single_unit \
+	test_urcu_multiflavor_single_unit_cxx \
+	test_urcu_multiflavor_single_unit_dynlink \
+	test_urcu_multiflavor_single_unit_dynlink_cxx \
+	test_build \
+	test_build_cxx \
+	test_build_dynlink \
+	test_build_dynlink_cxx
 
 noinst_HEADERS = test_urcu_multiflavor.h
 
@@ -19,9 +75,35 @@ 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
 
+get_cpu_mask_from_sysfs_cxx_SOURCES = get_cpu_mask_from_sysfs_cxx.cpp
+get_cpu_mask_from_sysfs_SOURCES = get_cpu_mask_from_sysfs.c
+get_max_cpuid_from_sysfs_cxx_SOURCES = get_max_cpuid_from_sysfs_cxx.cpp
+get_max_cpuid_from_sysfs_SOURCES = get_max_cpuid_from_sysfs.c
+
+test_arch_SOURCES = test_arch.c
+test_arch_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
+
+test_arch_cxx_SOURCES = test_arch_cxx.cpp
+test_arch_cxx_LDADD = $(URCU_COMMO_LIB) $(TAP_LIB)
+
+test_get_max_cpuid_from_mask_SOURCES = test_get_max_cpuid_from_mask.c
+test_get_max_cpuid_from_mask_LDADD = $(TAP_LIB)
+
+test_get_max_cpuid_from_mask_cxx_SOURCES = test_get_max_cpuid_from_mask_cxx.cpp
+test_get_max_cpuid_from_mask_cxx_LDADD = $(TAP_LIB)
+
+test_get_possible_cpus_array_len_SOURCES = test_get_possible_cpus_array_len.c
+test_get_possible_cpus_array_len_LDADD = $(TAP_LIB)
+
+test_get_possible_cpus_array_len_cxx_SOURCES = test_get_possible_cpus_array_len_cxx.cpp
+test_get_possible_cpus_array_len_cxx_LDADD = $(TAP_LIB)
+
 test_uatomic_SOURCES = test_uatomic.c
 test_uatomic_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
 
+test_uatomic_cxx_SOURCES = test_uatomic_cxx.cpp
+test_uatomic_cxx_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
+
 test_urcu_multiflavor_SOURCES = test_urcu_multiflavor.c \
 	test_urcu_multiflavor-memb.c \
 	test_urcu_multiflavor-mb.c \
@@ -31,6 +113,15 @@ test_urcu_multiflavor_SOURCES = test_urcu_multiflavor.c \
 test_urcu_multiflavor_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
 	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
+test_urcu_multiflavor_cxx_SOURCES = test_urcu_multiflavor_cxx.cpp \
+	test_urcu_multiflavor-memb_cxx.cpp \
+	test_urcu_multiflavor-mb_cxx.cpp \
+	test_urcu_multiflavor-signal_cxx.cpp \
+	test_urcu_multiflavor-qsbr_cxx.cpp \
+	test_urcu_multiflavor-bp_cxx.cpp
+test_urcu_multiflavor_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
+	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+
 test_urcu_multiflavor_dynlink_SOURCES = test_urcu_multiflavor.c \
 	test_urcu_multiflavor-memb.c \
 	test_urcu_multiflavor-mb.c \
@@ -41,19 +132,48 @@ test_urcu_multiflavor_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
 test_urcu_multiflavor_dynlink_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
 	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
+test_urcu_multiflavor_dynlink_cxx_SOURCES = test_urcu_multiflavor_cxx.cpp \
+	test_urcu_multiflavor-memb_cxx.cpp \
+	test_urcu_multiflavor-mb_cxx.cpp \
+	test_urcu_multiflavor-signal_cxx.cpp \
+	test_urcu_multiflavor-qsbr_cxx.cpp \
+	test_urcu_multiflavor-bp_cxx.cpp
+test_urcu_multiflavor_dynlink_cxx_CXXFLAGS = -DDYNAMIC_LINK_TEST $(AM_CXXFLAGS)
+test_urcu_multiflavor_dynlink_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
+	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+
+test_urcu_multiflavor_single_unit_SOURCES = test_urcu_multiflavor_single_unit.c
+test_urcu_multiflavor_single_unit_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
+	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+
+test_urcu_multiflavor_single_unit_cxx_SOURCES = test_urcu_multiflavor_single_unit_cxx.cpp
+test_urcu_multiflavor_single_unit_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
+	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+
+test_urcu_multiflavor_single_unit_dynlink_SOURCES = test_urcu_multiflavor_single_unit.c
+test_urcu_multiflavor_single_unit_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
+test_urcu_multiflavor_single_unit_dynlink_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
+	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+
+test_urcu_multiflavor_single_unit_dynlink_cxx_SOURCES = test_urcu_multiflavor_single_unit_cxx.cpp
+test_urcu_multiflavor_single_unit_dynlink_cxx_CXXFLAGS = -DDYNAMIC_LINK_TEST $(AM_CXXFLAGS)
+test_urcu_multiflavor_single_unit_dynlink_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
+	$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+
+test_build_SOURCES = \
+	test_build.c
+test_build_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)
+
+test_build_cxx_SOURCES = \
+	test_build_cxx.cpp
+test_build_cxx_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
+test_build_dynlink_SOURCES = \
+	test_build.c
+test_build_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
+test_build_dynlink_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)
 
-check-am:
-	./run.sh unit_tests
+test_build_dynlink_cxx_SOURCES = \
+	test_build_cxx.cpp
+test_build_dynlink_cxx_CXXFLAGS = -DDYNAMIC_LINK_TEST $(AM_CXXFLAGS)
+test_build_dynlink_cxx_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)