X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=377acd676aeb7a46b4db32a6f793e24d831ca881;hb=00665d8e072bc581e5a3e93b395bd6e19a4c2fcd;hp=6dc69de8772270ec6909123b8620baa9b59b5414;hpb=f09667041cd01c500c68b563c6af923def49027a;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dc69de8..377acd67 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,27 @@
-SUBDIRS = . hello fork 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
+SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx
 
-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