X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2FMakefile.am;h=1631ba66c94e2092fc8dc568156c76db8c692ece;hp=9bca8809a058cf7547339e8db62c5220ae7d9575;hb=ee28adfb4b4f5a6b24f4d23024ed256af37060c6;hpb=9ac429ef32142eaecfec2d1a44569464c4f8f721

diff --git a/tests/regression/ust/Makefile.am b/tests/regression/ust/Makefile.am
index 9bca8809a..1631ba66c 100644
--- a/tests/regression/ust/Makefile.am
+++ b/tests/regression/ust/Makefile.am
@@ -1,28 +1,7 @@
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session \
-		  overlap
+		overlap buffers-uid linking daemon exit-fast
 
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils -I$(top_srcdir)/src -g -Wall
-AM_LDFLAGS = -lurcu -lurcu-cds
-
-EXTRA_DIST = runall.sh run-ust-global-tests.sh
-
-noinst_PROGRAMS = ust_global_event_basic ust_global_event_wildcard
-
-UTILS=$(top_srcdir)/tests/utils/utils.h
-LIBLTTNG=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
-
-SESSIONDSRC=$(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \
-		 $(top_srcdir)/src/common/sessiond-comm/unix.c \
-		 $(top_srcdir)/src/common/sessiond-comm/inet.c \
-		 $(top_srcdir)/src/common/sessiond-comm/inet6.c
-
-ust_global_event_wildcard_SOURCES = ust_global_event_wildcard.c $(UTILS) \
-		$(SESSIONDSRC)
-ust_global_event_wildcard_LDADD = $(LIBLTTNG)
-
-ust_global_event_basic_SOURCES = ust_global_event_basic.c $(UTILS) \
-		$(SESSIONDSRC)
-ust_global_event_basic_LDADD = $(LIBLTTNG)
+EXTRA_DIST = test_event_basic test_event_wildcard
 
 endif