X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=9023d0535acff26f8ce1f42b9ed5ce53a6b90759;hb=70f9f7f95a5a36231e4a71191bcd88d582c3ca81;hp=4d066081d22c3c1a1e6f70ae377ee1f36c1f2871;hpb=d23b20e9573b260595f50e662e771d7a336ab07e;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4d066081..9023d053 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,25 @@
-SUBDIRS = . hello hello-static-lib same_line_tracepoint snprintf
-#ust-basic-tracing ust-multi-test
-#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 unit compile benchmark
 
-if CXX_WORKS
-SUBDIRS += hello.cxx
-endif
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(srcdir)/utils/tap-driver.sh
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+TESTS = \
+	unit/libringbuffer/test_shm \
+	unit/gcc-weak-hidden/test_gcc_weak_hidden \
+	unit/libmsgpack/test_msgpack \
+	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
+
+.PHONY: check-loop