X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=935c7546bbb94c2b62eefbf0b4006d321abf8fc8;hb=b33b46f7161604cb9168e9bbc854413cf18269be;hp=e4e06cebb8fd985aa41aa98e86a95409e8205c42;hpb=cacf036243594e11fc8a7e0f47f07af97a79042f;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e4e06ceb..935c7546 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,24 @@
-SUBDIRS = . hello hello2 basic basic_long fork simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx gcc-weak-hidden
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
-lib_LTLIBRARIES = libtap.la
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-libtap_la_SOURCES = \
-	tap.c \
-	tap.h
+TESTS = snprintf/test_snprintf \
+	ust-elf/test_ust_elf \
+	gcc-weak-hidden/test_gcc_weak_hidden
 
-libtap_la_LDFLAGS = -no-undefined -version-info 0:0:0
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-libtap_la_LIBADD = \
-	-lpthread
\ No newline at end of file
+.PHONY: check-loop