Replace same_line_marker test with same_line_tracepoint

[lttng-ust.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2b124228e2990484f3f35766139a366a0be6f12a..ed3db48c1aa918f8754ad46d69345f69be48b232 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,11 @@
-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \
-               demo hello.cxx daemon
+SUBDIRS = . hello hello-static-lib same_line_tracepoint
+#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
 
 noinst_LIBRARIES = libtap.a
@@ -9,4 +13,3 @@ noinst_LIBRARIES = libtap.a
 libtap_a_SOURCES = \
        tap.c \
        tap.h
-