X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=30b0e9a0f23897d6588bf37d8059c84c9004958a;hb=bf76f1eab36703b89fb512738a7b1662f4dd3694;hp=7ebd64be3987b653a06c987f0771de8d0198475d;hpb=580d134ba57956bdf709ef892cd27df40b956656;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7ebd64be..30b0e9a0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,26 @@
-SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo
-#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
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
-noinst_LIBRARIES = libtap.a
+SCRIPT_LIST = test_loop run.sh unit_tests
 
-libtap_a_SOURCES = \
-	tap.c \
-	tap.h
+dist_noinst_SCRIPTS = $(SCRIPT_LIST)
 
+all-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(SCRIPT_LIST); do \
+			cp -f $(srcdir)/$$script $(builddir); \
+		done; \
+	fi
+
+clean-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(SCRIPT_LIST); do \
+			rm -f $(builddir)/$$script; \
+		done; \
+	fi
+
+check-am:
+	./run.sh unit_tests