X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=204925c1762435f5886f1a162b791a868cf6b92c;hb=dbe6ade0ba17270b2cb119b9961bbb7e48ce4733;hp=317edcb0b355e87bf51947ec2e8b4ea572a48b0b;hpb=a106a9f8513054954003122126a8b33b56de4bd8;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 317edcb0..204925c1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,23 @@
-SUBDIRS = . hello same_line_tracepoint snprintf
+SUBDIRS = utils unit compile benchmark
 
-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
 
-dist_noinst_SCRIPTS = test_loop run.sh trace_matches unit_tests
+TESTS = \
+	unit/gcc-weak-hidden/test_gcc_weak_hidden \
+	unit/pthread_name/test_pthread_name \
+	unit/snprintf/test_snprintf \
+	unit/ust-elf/test_ust_elf
 
-noinst_LIBRARIES = libtap.a
+EXTRA_DIST = README
 
-libtap_a_SOURCES = tap.c tap.h
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-check-am:
-	./run.sh unit_tests
+.PHONY: check-loop