X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=29cfa814263f65593d5228e6b797a0379ead43de;hb=fe9615ba34edf2deb2b7f7dea935806a94627e9f;hp=b5166f9887860878b42f34ef183ee64900d2a193;hpb=43e5396b3b2247a3f57a8a797239359df3ff083f;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b5166f98..29cfa814 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,30 +1,44 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark
+# SPDX-License-Identifier: LGPL-2.1-only
 
-if CXX_WORKS
-SUBDIRS += hello.cxx
-endif
+SUBDIRS = utils unit compile benchmark regression
+
+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
+
+# Unit tests
+
+TESTS = \
+	unit/libringbuffer/test_shm \
+	unit/gcc-weak-hidden/test_gcc_weak_hidden \
+	unit/libcommon/test_smp \
+	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 BUILD_JNI_INTERFACE
-SUBDIRS += java-jul
+if HAVE_CXX
+TESTS += \
+	unit/ust-utils/test_ust_utils_cxx
 endif
 
-SCRIPT_LIST = test_loop run.sh unit_tests
+# Regression tests
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+TESTS += \
+	regression/abi0-conflict/test_abi0_conflict
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
+EXTRA_DIST = README
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-check-am:
-	./run.sh unit_tests
+.PHONY: check-loop