X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=b1042dbef1e64c7b0307a2b528a751792e962c9c;hb=e6e508c974088acd37ab97753632745f30eabe3e;hp=96a3faae6b69427527a87b52bdb70c4cbf0af206;hpb=f3c7428e8878c6e467020881813c018e0d530a21;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96a3faae..b1042dbe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,19 @@
 SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \
-		ctf-types test-app-ctx
+		ctf-types test-app-ctx gcc-weak-hidden hello-many
 
 if CXX_WORKS
 SUBDIRS += hello.cxx
 endif
 
+LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/config/tap-driver.sh
 
 TESTS = snprintf/test_snprintf \
-	ust-elf/test_ust_elf
+	ust-elf/test_ust_elf \
+	gcc-weak-hidden/test_gcc_weak_hidden
+
+EXTRA_DIST = README
 
 check-loop:
 	while [ 0 ]; do \