X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=eda9f2351310e0b10886d6ee904eaea847973795;hb=235d06f02f6f0306e432165fdcb11d9a6debd480;hp=467b191f9daa063eff5606a738f0a78a9f757aeb;hpb=5df9e303fa9d81b3a6d989612c7a98039ec76fd1;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 467b191f..eda9f235 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,13 @@
 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_formats \
 	bin/intersection/test_intersection \
 	lib/test_bitfield \
 	lib/test_seek_empty_packet \
@@ -16,10 +18,10 @@ TESTS = bin/test_trace_read \
 	lib/test_bt_ctf_field_type_validation
 
 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