X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=ac4d1cc9bde4182409a2ed51c254290815b6554e;hb=fb0f6ca9385e1813311cfd917c130b40bec04970;hp=9023d0535acff26f8ce1f42b9ed5ce53a6b90759;hpb=49705576d8779e3fa2b3efc4294bc03261f76935;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9023d053..ac4d1cc9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,16 +1,38 @@
-SUBDIRS = utils unit compile benchmark
+# SPDX-License-Identifier: LGPL-2.1-only
 
-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(srcdir)/utils/tap-driver.sh
+SUBDIRS = utils unit compile benchmark regression
+
+LOG_DRIVER_FLAGS = --merge --comments
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
+	UST_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \
+	UST_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \
+	$(SHELL) $(srcdir)/utils/tap-driver.sh
+
+# Unit tests
 
 TESTS = \
 	unit/libringbuffer/test_shm \
 	unit/gcc-weak-hidden/test_gcc_weak_hidden \
+	unit/libcommon/test_get_cpu_mask_from_sysfs \
+	unit/libcommon/test_get_max_cpuid_from_mask \
+	unit/libcommon/test_get_max_cpuid_from_sysfs \
+	unit/libcommon/test_get_possible_cpus_array_len \
 	unit/libmsgpack/test_msgpack \
 	unit/pthread_name/test_pthread_name \
 	unit/snprintf/test_snprintf \
-	unit/ust-elf/test_ust_elf
+	unit/ust-elf/test_ust_elf \
+	unit/ust-error/test_ust_error \
+	unit/ust-utils/test_ust_utils
+
+if HAVE_CXX
+TESTS += \
+	unit/ust-utils/test_ust_utils_cxx
+endif
+
+# Regression tests
+
+TESTS += \
+	regression/abi0-conflict/test_abi0_conflict
 
 EXTRA_DIST = README