X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=d472a6ac3faa1a29bff83e0ee884009ffd2efabf;hb=42f209e98d68936df04ec947a12e684155ce7cfe;hp=e4e06cebb8fd985aa41aa98e86a95409e8205c42;hpb=2298f3297443ba26f761e272c45456ed857071bc;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e4e06ceb..d472a6ac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +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
+SUBDIRS = utils hello same_line_tracepoint snprintf
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
-lib_LTLIBRARIES = libtap.la
+dist_noinst_SCRIPTS = test_loop run.sh unit_tests
 
-libtap_la_SOURCES = \
-	tap.c \
-	tap.h
-
-libtap_la_LDFLAGS = -no-undefined -version-info 0:0:0
-
-libtap_la_LIBADD = \
-	-lpthread
\ No newline at end of file
+check-am:
+	./run.sh unit_tests