X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=f15d6d85069bd5d9596746426aad216dbadc5ab0;hb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;hp=9b9adb66260f0ff9b1143d5af2f6f62403907c04;hpb=9ee9ed8ccb340f09caa8df01c7bf6c1191207787;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b9adb66..f15d6d85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,25 +1,40 @@
-SUBDIRS = utils bin lib
+SUBDIRS = utils bin lib bindings
 
+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/test_convert_args \
+	bin/intersection/test_intersection \
 	lib/test_bitfield \
 	lib/test_seek_empty_packet \
 	lib/test_seek_big_trace \
 	lib/test_ctf_writer_complete \
 	lib/test_bt_values \
 	lib/test_ctf_ir_ref \
-	lib/test_bt_ctf_field_type_validation
+	lib/test_bt_ctf_field_type_validation \
+	lib/test_ir_visit \
+	lib/test_trace_listener \
+	lib/test_bt_notification_heap \
+	lib/test_plugin_complete \
+	lib/test_graph_topo \
+	lib/test_cc_prio_map
 
 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 \
+	lib/writer/test_ctf_writer_no_packet_context.py \
+	lib/writer/test_ctf_writer_empty_packet.py \
+	bindings/python/bt2/testall.sh
+endif