X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=7be533317b5568c043a9a880f0df0a8b271b337c;hb=50d2bb48d09d5b6ae23185e8f916152e2371d04a;hp=b1042dbef1e64c7b0307a2b528a751792e962c9c;hpb=e6e508c974088acd37ab97753632745f30eabe3e;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b1042dbe..7be53331 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,17 +1,20 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
-		ctf-types test-app-ctx gcc-weak-hidden hello-many
+# SPDX-License-Identifier: LGPL-2.1-only
 
-if CXX_WORKS
-SUBDIRS += hello.cxx
-endif
+SUBDIRS = utils unit compile benchmark
 
-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/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
 
-TESTS = snprintf/test_snprintf \
-	ust-elf/test_ust_elf \
-	gcc-weak-hidden/test_gcc_weak_hidden
+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
 
 EXTRA_DIST = README