X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=tests%2FMakefile.am;h=317edcb0b355e87bf51947ec2e8b4ea572a48b0b;hb=402147a0ffcc8fb0a1784a6d880fac318038e686;hp=4ab0b21bd78316f9e91624c0b9ac038ee54696e6;hpb=8d8a24c8565ce6dce7e7bd1045a95d1d2af5e536;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4ab0b21b..317edcb0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,14 @@
-SUBDIRS = . hello
-#SUBDIRS = . hello hello2 basic basic_long fork 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