X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=fd2eac397a04e3e5a64f20fea5dec32748772620;hb=1e1110055efac3a1713fe0c7b5f36d5b98895d92;hp=0308483d31768ba09f7a52a8ea0be6bc41698b49;hpb=ad0038b792809ead6ac306000946b8c9e194fe26;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0308483d..fd2eac39 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1,23 @@
-SUBDIRS = hello hello2
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx
+
+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
+
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
+
+.PHONY: check-loop