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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3d7ceeb9..9023d053 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,26 +1,25 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf
+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
 
-SCRIPT_LIST = test_loop run.sh unit_tests
+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
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+EXTRA_DIST = README
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
+check-loop:
+	while [ 0 ]; do \
+		$(MAKE) $(AM_MAKEFLAGS) check; \
+		if [ "$$?" != "0" ]; then \
+			break; \
+		fi \
+	done
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
-
-check-am:
-	./run.sh unit_tests
+.PHONY: check-loop