X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c8505eb5ff77da7aec5ee633125c575abd09ef14;hb=96a6162e1925d4bd1dfc6f4167d75f396c0dbe4c;hp=7688e7ef82d257f6eb562b843f1952f01d3b6f08;hpb=761547672693a192995b72ad69b41d079636de3a;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7688e7ef..c8505eb5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,24 @@
-SUBDIRS = hello hello2 basic basic_long fork simple_include snprintf test-nevents test-libmallocwrap
+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
+
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
+
+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