X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=9023d0535acff26f8ce1f42b9ed5ce53a6b90759;hb=e494a9cdf17705bddf2169adf3945ed2ae335db9;hp=6dc69de8772270ec6909123b8620baa9b59b5414;hpb=f09667041cd01c500c68b563c6af923def49027a;p=deliverable%2Flttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dc69de8..9023d053 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,25 @@
-SUBDIRS = . hello fork 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
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(srcdir)/utils/tap-driver.sh
 
-noinst_LIBRARIES = libtap.a
+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
 
-libtap_a_SOURCES = \
-	tap.c \
-	tap.h
+EXTRA_DIST = README
 
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
+
+.PHONY: check-loop