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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 83119805..9eee9d9c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,10 @@
-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 fork demo daemon
+#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
+
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
 dist_noinst_SCRIPTS = test_loop runtests trace_matches