X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=6f9b969ccddbbb23fc01201d0b4a902e2a0bd3a7;hb=e2ad3b4ff276e0ea0671d5f703c913cf54c10500;hp=83119805714186dbbe8982a371987c2a5f5fb485;hpb=67787f501db5865f004a7de72312383aee97e05b;p=lttng-ust.git

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