X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=b5166f9887860878b42f34ef183ee64900d2a193;hb=9a37727f9dc181b93fbfcb273f59340a66fc056e;hp=43fb2036f3c080406527327c4051e019efa325a3;hpb=46cec820d380796882540bf5a8904949d86e3515;p=lttng-ust.git

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