X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=c8505eb5ff77da7aec5ee633125c575abd09ef14;hp=2b124228e2990484f3f35766139a366a0be6f12a;hb=HEAD;hpb=38936cf4da9aaf752fdc9c2c56e00b9ddcad8530

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2b124228..79113ce7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,49 @@
-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \
-		demo hello.cxx daemon
-#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-FileCopyrightText: 2023 EfficiOS, Inc
+#
+# SPDX-License-Identifier: LGPL-2.1-only
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+SUBDIRS = utils unit compile benchmark regression
 
-noinst_LIBRARIES = libtap.a
+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
 
-libtap_a_SOURCES = \
-	tap.c \
-	tap.h
+# Unit tests
 
+TESTS = \
+	unit/libringbuffer/test_shm \
+	unit/gcc-weak-hidden/test_gcc_weak_hidden \
+	unit/libcommon/test_get_cpu_mask_from_sysfs \
+	unit/libcommon/test_get_max_cpuid_from_mask \
+	unit/libcommon/test_get_max_cpuid_from_sysfs \
+	unit/libcommon/test_get_possible_cpus_array_len \
+	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
+
+# Regression tests
+
+TESTS += \
+	regression/abi0-conflict/test_abi0_conflict
+
+EXTRA_DIST = README.md
+
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
+
+.PHONY: check-loop