X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=6792b0b9b027fea97d551fe4053f6cffba2858a4;hb=8707de3510ac14bcdf0d39d53a64d47726f75d3b;hp=e5c6b89979a4a3968cb8977a4ac9eee3f724f946;hpb=5007b4de1f322cf1645c4f5224665b19304d845a;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e5c6b899..6792b0b9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,16 +1,24 @@
-SUBDIRS = . hello hello-static-lib
-#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/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