X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=1dd8bbea7b5e3d27671c3bec78e8cd53f0acb03d;hp=e0b3697308e7e844f9defc39c2b6355c7a801a78;hb=6816a5cb0ae2e7b7ee9e6b460629f89a2f4f99e6;hpb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0b369730..1dd8bbea7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,19 +1,21 @@
-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall -lurcu -lurcu-cds
+SUBDIRS = .
 
-EXTRA_DIST = runall.sh lttng/runall.sh lttng/run-kernel-tests.sh
+AM_CFLAGS=-g -Wall -lurcu -lurcu-cds
 
-noinst_PROGRAMS = test_sessions test_kernel_data_trace kernel_all_events_basic \
-				  kernel_event_basic
+EXTRA_DIST = runall.sh utils.sh lttng/runall.sh lttng/run-kernel-tests.sh
+
+noinst_PROGRAMS = test_sessions test_kernel_data_trace \
+				  kernel_all_events_basic kernel_event_basic
 
 UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c $(top_srcdir)/ltt-sessiond/hashtable.c \
-		 $(top_srcdir)/hashtable/rculfhash.c $(top_srcdir)/hashtable/hash.c
-KERN_DATA_TRACE=$(top_srcdir)/ltt-sessiond/trace-kernel.c
-LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \
-		 $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c
+SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c
+KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c
+LIBLTTNG=$(top_srcdir)/src/lib/lttng-ctl/lttng-ctl.c \
+		 $(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c
 
 test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
+test_sessions_LDADD = $(top_builddir)/src/common/libcommon.la \
+					  $(top_builddir)/src/common/hashtable/libhashtable.la
 
 test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
 
@@ -21,5 +23,21 @@ kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIB
 
 kernel_event_basic_SOURCES = lttng/kernel_event_basic.c $(UTILS) $(LIBLTTNG)
 
+if HAVE_LIBLTTNG_UST_CTL
+SUBDIRS += ust-nevents ust-nprocesses
+EXTRA_DIST += lttng/run-ust-global-tests.sh
+noinst_PROGRAMS += ust_global_event_basic ust_global_all_events_basic test_ust_data_trace
+
+UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c
+
+test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
+test_ust_data_trace_LDADD = $(top_builddir)/src/common/libcommon.la \
+							$(top_builddir)/src/common/hashtable/libhashtable.la
+
+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)
+endif # HAVE_LIBLTTNG_UST_CTL
+
 check-am:
 	./runall.sh