X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=79113ce76af315a7d93d820ceee1678371431c93;hb=e03d7c66c57bf268b87296566a5160039f35ccfb;hp=6ecd565fb867ca06472c016d70e1b120444f6262;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6ecd565f..79113ce7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,20 +1,42 @@
+# SPDX-FileCopyrightText: 2023 EfficiOS, Inc
+#
 # SPDX-License-Identifier: LGPL-2.1-only
 
-SUBDIRS = utils unit compile benchmark
+SUBDIRS = utils unit compile benchmark regression
 
-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(srcdir)/utils/tap-driver.sh
+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
+EXTRA_DIST = README.md
 
 check-loop:
 	while [ 0 ]; do \