X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=98c7473c02b42b7ca3ac9b6f2e3b1cd67135790d;hb=e1e2b80ca57ed6d5d9e1be341095fb20153e86db;hp=a485e27cf0ab0b7f5fec44292b47467b45255822;hpb=4cdc32cf066f85bce93f1b25167bd258a18367af;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a485e27c..98c7473c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,27 @@
 SUBDIRS = utils bin lib
 
-EXTRA_DIST = ctf-traces/** tests
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-dist_noinst_SCRIPTS = run.sh
+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
 
-check-am:
-	./run.sh tests
+EXTRA_DIST = $(srcdir)/ctf-traces/** \
+	     $(srcdir)/debug-info-data/** \
+	     $(srcdir)/debug-info-data/.build-id/cd/**
+
+if ENABLE_DEBUG_INFO
+TESTS += lib/test_dwarf_complete \
+	lib/test_bin_info_complete
+endif
+
+if USE_PYTHON
+TESTS += bin/intersection/test_multi_trace_intersection.py
+endif