X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=91b4ceffdcbf9be865c199dddb03e422ef03d9c0;hb=7f9aec0388cf315e7f54e1b8a96685210d08b088;hp=3d7ceeb9d9cb874f1f8215a4f355c9af16b9dcf3;hpb=22609c7a82c5c8ebc07c19cade9b4d6ff61bd0d0;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3d7ceeb9..91b4ceff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,26 +1,26 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx gcc-weak-hidden hello-many \
+		libringbuffer
 
 if CXX_WORKS
 SUBDIRS += hello.cxx
 endif
 
-SCRIPT_LIST = test_loop run.sh unit_tests
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+TESTS = snprintf/test_snprintf \
+	ust-elf/test_ust_elf \
+	gcc-weak-hidden/test_gcc_weak_hidden \
+	libringbuffer/test_smp
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
-
-check-am:
-	./run.sh unit_tests
+.PHONY: check-loop