X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c8505eb5ff77da7aec5ee633125c575abd09ef14;hb=a211b293bc6a610bed73a60006967663a30e4931;hp=abe446e2d9aaf81000271388cbdb34cfdf92df03;hpb=69f1f6526a6d40556ed3dcb50cdc199f45793b2f;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index abe446e2..c8505eb5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1,24 @@
-SUBDIRS = hello hello2 basic basic_long fork simple_include snprintf
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx gcc-weak-hidden hello-many
+
+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