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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 56e93c11..98e0b85f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,30 +1,26 @@
 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 = 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)/debuginfo-data/** \
+	     $(srcdir)/debuginfo-data/.build-id/cd/**
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
-
-check-am:
-	./run.sh $(srcdir)/tests
 if ENABLE_DEBUGINFO
-	./run.sh $(srcdir)/tests_debuginfo
+TESTS += lib/test_dwarf_complete \
+	lib/test_bin_info_complete
+endif
+
+if USE_PYTHON
+TESTS += bin/intersection/test_multi_trace_intersection.py
 endif