X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=d750ae391ac7309034ae631fa5391100b11b0375;hb=6825ea4493cbd97e428def01d1cf3b94477e4912;hp=d3ba1f631fbdbb6b2144b8f40e506dcb3df5b0f5;hpb=7ae0a9445db9a97a43f0054bd38144bfddb00ce0;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d3ba1f63..d750ae39 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-only
 
-SUBDIRS = utils unit compile benchmark
+SUBDIRS = utils unit compile benchmark regression
 
 LOG_DRIVER_FLAGS = --merge --comments
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
@@ -8,6 +8,8 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
 	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 \
@@ -15,7 +17,18 @@ TESTS = \
 	unit/pthread_name/test_pthread_name \
 	unit/snprintf/test_snprintf \
 	unit/ust-elf/test_ust_elf \
-	unit/ust-error/test_ust_error
+	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