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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 43fb2036..9023d053 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,25 @@
-SUBDIRS = . hello hello2 basic basic_long fork 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
 
-lib_LTLIBRARIES = libtap.la
+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_la_SOURCES = \
-	tap.c \
-	tap.h
+EXTRA_DIST = README
 
-libtap_la_LDFLAGS = -no-undefined -version-info 0:0:0
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-libtap_la_LIBADD = \
-	-lpthread
\ No newline at end of file
+.PHONY: check-loop