X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=b2c1c2b51e4cc96105a6b59c5b598640512caee6;hb=95fa2ba4fbbfac95bca6f437b2bb4389789b21eb;hp=dd383bc7ff8ddc3beedd9bd5b281261aabbc60ed;hpb=b96787d23b84a303d49058c68c382c43b6b53625;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dd383bc7..b2c1c2b5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,16 +1,36 @@
-SUBDIRS = . hello hello-static-lib fork daemon
-#ust-basic-tracing ust-multi-test
-#SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
+# 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 runtests trace_matches
+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
 
+.PHONY: check-loop