X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=935c7546bbb94c2b62eefbf0b4006d321abf8fc8;hb=4c70c05ca1c085156eba1c61c06f858885c63755;hp=317edcb0b355e87bf51947ec2e8b4ea572a48b0b;hpb=a106a9f8513054954003122126a8b33b56de4bd8;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 317edcb0..935c7546 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,24 @@
-SUBDIRS = . hello same_line_tracepoint snprintf
+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
 
-dist_noinst_SCRIPTS = test_loop run.sh trace_matches unit_tests
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-noinst_LIBRARIES = libtap.a
+TESTS = snprintf/test_snprintf \
+	ust-elf/test_ust_elf \
+	gcc-weak-hidden/test_gcc_weak_hidden
 
-libtap_a_SOURCES = tap.c tap.h
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-check-am:
-	./run.sh unit_tests
+.PHONY: check-loop