X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c8505eb5ff77da7aec5ee633125c575abd09ef14;hb=32974710aab75d01a8ae48d0be3641c2f56e45a9;hp=e79ab7cec1760c256a1b25589ca8037f217608da;hpb=246e16259bbd3eefc591a829f8396194f71e0b2e;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e79ab7ce..c8505eb5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,24 @@
-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx
-#SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx gcc-weak-hidden hello-many
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
-noinst_LIBRARIES = libtap.a
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-libtap_a_SOURCES = \
-	tap.c \
-	tap.h
+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