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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96a3faae..b2c1c2b5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,29 @@
-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 --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
 
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+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
 
-TESTS = snprintf/test_snprintf \
-	ust-elf/test_ust_elf
+EXTRA_DIST = README
 
 check-loop:
 	while [ 0 ]; do \