X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=98c7473c02b42b7ca3ac9b6f2e3b1cd67135790d;hp=7045aef90d8821b597a6b5839fc7e131fd15fbf2;hb=ccf5a73267872a4088953d0c3f41747427912fde;hpb=e5c8b0a6fa916208fc800c3e46378dbd0bd8b0b4

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7045aef9..98c7473c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,22 +1,27 @@
 SUBDIRS = utils bin lib
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/config/tap-driver.sh
 
 TESTS = bin/test_trace_read \
 	bin/test_trace_read \
 	bin/test_packet_seq_num \
-	bin/test_intersection \
+	bin/intersection/test_intersection \
 	lib/test_bitfield \
 	lib/test_seek_empty_packet \
 	lib/test_seek_big_trace \
 	lib/test_ctf_writer_complete
 
 EXTRA_DIST = $(srcdir)/ctf-traces/** \
-	     $(srcdir)/debuginfo-data/** \
-	     $(srcdir)/debuginfo-data/.build-id/cd/**
+	     $(srcdir)/debug-info-data/** \
+	     $(srcdir)/debug-info-data/.build-id/cd/**
 
-if ENABLE_DEBUGINFO
+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