Tests: Add missing --merge LOG_DRIVER_FLAGS

[babeltrace.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 467b191f9daa063eff5606a738f0a78a9f757aeb..a51531821dc08a621bcbf3f1bd9ecd81acab6805 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = utils bin lib
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
        $(top_srcdir)/config/tap-driver.sh
 
@@ -16,10 +17,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