X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c8505eb5ff77da7aec5ee633125c575abd09ef14;hb=6c737d0594cac0d969e1948ea1ed55c15be9cec8;hp=b5166f9887860878b42f34ef183ee64900d2a193;hpb=43e5396b3b2247a3f57a8a797239359df3ff083f;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b5166f98..c8505eb5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,30 +1,24 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark
+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
 
-if BUILD_JNI_INTERFACE
-SUBDIRS += java-jul
-endif
-
-SCRIPT_LIST = test_loop run.sh unit_tests
-
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
+TESTS = snprintf/test_snprintf \
+	ust-elf/test_ust_elf \
+	gcc-weak-hidden/test_gcc_weak_hidden
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-check-am:
-	./run.sh unit_tests
+.PHONY: check-loop