X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2FMakefile.am;h=d750ae391ac7309034ae631fa5391100b11b0375;hb=81b2d23800224648edd5850dd43b78d00b668a5e;hp=d46c94a58fe293e51a84d3dd456d292ebef73bbc;hpb=df8b7e52ec98f7f05422fc1e90929e19fcb8f03f;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d46c94a5..d750ae39 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,18 +1,34 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
-		ctf-types test-app-ctx gcc-weak-hidden hello-many pthread_name
+# SPDX-License-Identifier: LGPL-2.1-only
 
-if CXX_WORKS
-SUBDIRS += hello.cxx
+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/libmsgpack/test_msgpack \
+	unit/pthread_name/test_pthread_name \
+	unit/snprintf/test_snprintf \
+	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
 
-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+# Regression tests
 
-TESTS = snprintf/test_snprintf \
-	ust-elf/test_ust_elf \
-	gcc-weak-hidden/test_gcc_weak_hidden \
-	pthread_name/test_pthread_name
+TESTS += \
+	regression/abi0-conflict/test_abi0_conflict
 
 EXTRA_DIST = README