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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 935c7546..9023d053 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,17 +1,18 @@
-SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
-		ctf-types test-app-ctx gcc-weak-hidden
-
-if CXX_WORKS
-SUBDIRS += hello.cxx
-endif
+SUBDIRS = utils unit compile benchmark
 
 LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+	$(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
 
-TESTS = snprintf/test_snprintf \
-	ust-elf/test_ust_elf \
-	gcc-weak-hidden/test_gcc_weak_hidden
+EXTRA_DIST = README
 
 check-loop:
 	while [ 0 ]; do \