X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=935c7546bbb94c2b62eefbf0b4006d321abf8fc8;hb=28098fae46f4f5681c3c3b7984eca09573444929;hp=242933252f6cfe2a7d675744a707dfc4cc90c4c2;hpb=e6ef41119258799ca3720c5f2c5af4db327b2720;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 24293325..935c7546 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,24 @@
-SUBDIRS = hello hello2 basic basic_long fork simple_include snprintf test-nevents test-libmallocwrap
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx gcc-weak-hidden
 
-noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
+
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
+
+TESTS = snprintf/test_snprintf \
+	ust-elf/test_ust_elf \
+	gcc-weak-hidden/test_gcc_weak_hidden
+
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
+
+.PHONY: check-loop