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

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 5f4a6e4c0..1be72094a 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,11 @@ 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 \
+	tools/working-directory/test_relayd_workding_directory \
+	tools/relayd-grouping/test_ust \
+	tools/relayd-grouping/test_kernel
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust
@@ -36,7 +41,8 @@ TESTS += ust/before-after/test_before_after \
 	ust/getcpu-override/test_getcpu_override \
 	ust/clock-override/test_clock_override \
 	ust/test_event_basic \
-	ust/test_event_tracef
+	ust/test_event_tracef \
+	ust/test_event_perf
 endif # HAVE_LIBLTTNG_UST_CTL
 
 if PYTHON_BINDING