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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index eca4e20a..9023d053 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,25 @@
-SUBDIRS = hello hello2 basic basic_long fork simple_include snprintf test-nevents
+SUBDIRS = utils unit compile benchmark
 
-noinst_SCRIPTS = test_loop runtests trace_matches
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(srcdir)/utils/tap-driver.sh
+
+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
+
+EXTRA_DIST = README
+
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
+
+.PHONY: check-loop