X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=d472a6ac3faa1a29bff83e0ee884009ffd2efabf;hb=42f209e98d68936df04ec947a12e684155ce7cfe;hp=2b124228e2990484f3f35766139a366a0be6f12a;hpb=38936cf4da9aaf752fdc9c2c56e00b9ddcad8530;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2b124228..d472a6ac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,10 @@
-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \
-		demo hello.cxx daemon
-#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 hello same_line_tracepoint snprintf
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
-noinst_LIBRARIES = libtap.a
-
-libtap_a_SOURCES = \
-	tap.c \
-	tap.h
+dist_noinst_SCRIPTS = test_loop run.sh unit_tests
 
+check-am:
+	./run.sh unit_tests