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

diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am
index dc603904..97d8eeba 100644
--- a/tests/bin/Makefile.am
+++ b/tests/bin/Makefile.am
@@ -1,2 +1,15 @@
 SUBDIRS = intersection
 check_SCRIPTS = test_trace_read test_packet_seq_num test_convert_args
+
+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