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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96a3faae..6ecd565f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,20 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
-		ctf-types test-app-ctx
+# 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
+	$(srcdir)/utils/tap-driver.sh
 
-TESTS = snprintf/test_snprintf \
-	ust-elf/test_ust_elf
+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
 
 check-loop:
 	while [ 0 ]; do \