X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=98c7473c02b42b7ca3ac9b6f2e3b1cd67135790d;hb=53d369292fd30d0932fb9e810a0d9a7388c0ddda;hp=56e93c115ab213f74943a59059ef30a457c0f7e5;hpb=c3a1997ea20bfa7023fa5034530b9bd7965a6561;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 56e93c11..98c7473c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,30 +1,27 @@
 SUBDIRS = utils bin lib
 
-EXTRA_DIST = $(srcdir)/ctf-traces/** tests
-if ENABLE_DEBUGINFO
-EXTRA_DIST += $(srcdir)/debuginfo-data/** tests_debuginfo
-endif
-
-SCRIPT_LIST = run.sh
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+TESTS = bin/test_trace_read \
+	bin/test_trace_read \
+	bin/test_packet_seq_num \
+	bin/intersection/test_intersection \
+	lib/test_bitfield \
+	lib/test_seek_empty_packet \
+	lib/test_seek_big_trace \
+	lib/test_ctf_writer_complete
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
+EXTRA_DIST = $(srcdir)/ctf-traces/** \
+	     $(srcdir)/debug-info-data/** \
+	     $(srcdir)/debug-info-data/.build-id/cd/**
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
+if ENABLE_DEBUG_INFO
+TESTS += lib/test_dwarf_complete \
+	lib/test_bin_info_complete
+endif
 
-check-am:
-	./run.sh $(srcdir)/tests
-if ENABLE_DEBUGINFO
-	./run.sh $(srcdir)/tests_debuginfo
+if USE_PYTHON
+TESTS += bin/intersection/test_multi_trace_intersection.py
 endif