X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=b2c1c2b51e4cc96105a6b59c5b598640512caee6;hb=810185f3a90e717e2a482b4555f90f4d4f6d7bbf;hp=425440a5160890101a31c00bc76c4d615d69305e;hpb=83b68040af326eaa84e6ec24a50fd409e66ec37b;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 425440a5..b2c1c2b5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,36 @@
-SUBDIRS = . hello hello-static-lib same_line_tracepoint snprintf
+# 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
 
-dist_noinst_SCRIPTS = test_loop run.sh trace_matches 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
 
-noinst_LIBRARIES = libtap.a
+EXTRA_DIST = README
 
-libtap_a_SOURCES = tap.c tap.h
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-check-am:
-	./run.sh unit_tests
+.PHONY: check-loop