X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbin%2FMakefile.am;h=97d8eeba4a7f7322d76869e276d0996f2d92203b;hb=6ca1931cb32ca2eb33252896d2a42a4c48af436a;hp=086919b77cf1064bb002071342a6d73acd48cb61;hpb=7d5f7a9a3f914878c0ce78f299db1815a550b5d0;p=babeltrace.git

diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am
index 086919b7..97d8eeba 100644
--- a/tests/bin/Makefile.am
+++ b/tests/bin/Makefile.am
@@ -1,7 +1,15 @@
-noinst_SCRIPTS = test_trace_read
-CLEANFILES = $(noinst_SCRIPTS)
-EXTRA_DIST = test_trace_read.in
+SUBDIRS = intersection
+check_SCRIPTS = test_trace_read test_packet_seq_num test_convert_args
 
-$(noinst_SCRIPTS): %: %.in
-	sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@
-	chmod +x $@
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
+
+TESTS = test_trace_read \
+	test_trace_read \
+	test_packet_seq_num \
+	test_convert_args \
+	intersection/test_intersection
+
+if USE_PYTHON
+TESTS += intersection/test_multi_trace_intersection.py
+endif