Rename the "metadata regenerate" command to "regenerate metadata"

[lttng-tools.git] / tests / regression / Makefile.am

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 5f4a6e4c063d3e666a0ce89f954a673a8ec514a8..2297ea1e3696b4ffcff968a35c12c2410b587ec2 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = tools kernel ust
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
        $(top_srcdir)/config/tap-driver.sh
 
@@ -21,7 +22,7 @@ TESTS = tools/filtering/test_invalid_filter \
        tools/mi/test_mi \
        tools/wildcard/test_event_wildcard \
        tools/crash/test_crash \
-       tools/metadata-regen/test_ust
+       tools/regen-metadata/test_ust
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust