Add abi0 conflict tests

[lttng-ust.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9023d0535acff26f8ce1f42b9ed5ce53a6b90759..d750ae391ac7309034ae631fa5391100b11b0375 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,14 @@
-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 \
@@ -10,7 +16,19 @@ TESTS = \
        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