X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=f2fa9d7aa293a7e68235695d7550900e3d29e384;hp=5f4a6e4c063d3e666a0ce89f954a673a8ec514a8;hb=54cd6107ba9eacbe6e54292293698a8d2d5083c7;hpb=a36b26b4511eded3dbaecaa3a154b5c212391a31

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 5f4a6e4c0..f2fa9d7aa 100644
--- 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,8 @@ 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 \
+	tools/regen-statedump/test_ust
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust