X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=10db1bb6b636b16bde5644c711c36de09cb8b713;hp=a10390614ca5bc9f872d234f4739b4a93224658d;hb=8dd3235128d2f304a4058741adb49ca043c2c39b;hpb=c60ddab68a253f696908ed3766207b8443b85982

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a10390614..10db1bb6b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,24 +1,36 @@
 AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall
+		  -I$(top_srcdir)/liblttngctl -g -Wall -lurcu -lurcu-cds
 
-EXTRA_DIST = runall.sh lttng/runall.sh
+EXTRA_DIST = runall.sh lttng/runall.sh lttng/run-kernel-tests.sh lttng/run-ust-tests.sh
 
-noinst_PROGRAMS = test_sessions test_kernel_data_trace kernel_all_events_basic \
-				  kernel_event_basic
+noinst_PROGRAMS = test_sessions test_kernel_data_trace test_ust_data_trace \
+				  kernel_all_events_basic kernel_event_basic \
+				  ust_global_event_basic ust_global_all_events_basic
 
 UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/ltt-sessiond/trace.c
+SESSIONS=$(top_srcdir)/lttng-sessiond/session.c
+KERN_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-kernel.c
+UST_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-ust.c
 LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \
 		 $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c
 
 test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
+test_sessions_LDADD = $(top_builddir)/common/libcommon.la \
+					  $(top_builddir)/liblttng-ht/liblttng-ht.la
 
 test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
 
+test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
+test_ust_data_trace_LDADD = $(top_builddir)/common/libcommon.la \
+							$(top_builddir)/liblttng-ht/liblttng-ht.la
+
 kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
 
 kernel_event_basic_SOURCES = lttng/kernel_event_basic.c $(UTILS) $(LIBLTTNG)
 
+ust_global_all_events_basic_SOURCES = lttng/ust_global_all_events_basic.c $(UTILS) $(LIBLTTNG)
+
+ust_global_event_basic_SOURCES = lttng/ust_global_event_basic.c $(UTILS) $(LIBLTTNG)
+
 check-am:
 	./runall.sh