X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=935c7546bbb94c2b62eefbf0b4006d321abf8fc8;hb=3ff7660f2ce6362de87a48bc45c9a98b9c785472;hp=061f5e21b42efcf0907aedbd16545250f8ea07ee;hpb=25ea915c3c33bf3aafa4436b66a6699f0292bb4b;p=lttng-ust.git

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