X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=98c7473c02b42b7ca3ac9b6f2e3b1cd67135790d;hb=285fd56cebb6b02bb252bdce247efe3ba01bb2be;hp=5927f59eff6a2edee32871a901277661ea9c2f10;hpb=f5a64ec04a8cdd75a3940f21f4c2b908fc5ba667;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5927f59e..98c7473c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,34 +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
 
-TEMPLIST := $(shell mktemp -u)
-check-am:
-	@cat $(srcdir)/tests > $(TEMPLIST)
-if ENABLE_DEBUGINFO
-	@echo '' >> $(TEMPLIST)
-	@cat $(srcdir)/tests_debuginfo >> $(TEMPLIST)
+if USE_PYTHON
+TESTS += bin/intersection/test_multi_trace_intersection.py
 endif
-	./run.sh $(TEMPLIST)
-	rm $(TEMPLIST)