X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=317edcb0b355e87bf51947ec2e8b4ea572a48b0b;hb=a106a9f8513054954003122126a8b33b56de4bd8;hp=6dc69de8772270ec6909123b8620baa9b59b5414;hpb=f09667041cd01c500c68b563c6af923def49027a;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dc69de8..317edcb0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,14 @@
-SUBDIRS = . hello fork 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 = . hello same_line_tracepoint snprintf
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
+
+dist_noinst_SCRIPTS = test_loop run.sh trace_matches unit_tests
 
 noinst_LIBRARIES = libtap.a
 
-libtap_a_SOURCES = \
-	tap.c \
-	tap.h
+libtap_a_SOURCES = tap.c tap.h
 
+check-am:
+	./run.sh unit_tests