X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=95acd640b7fa56a8b16e22c105a635b2a6c549ff;hp=22d784fbaa0873f9ce03827303ba551e597fa95e;hb=ec8f26de70d4862d4fad73f844c19fabf30b19c8;hpb=b79ac29cdef552e0266eb1bae6e95a3ff6f03fab

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 22d784fba..95acd640b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,45 @@
+SUBDIRS = .
+
 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 lttng/run-kernel-tests.sh
 
-noinst_PROGRAMS = test_sessions test_kernel_data_trace
+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
-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
+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)
 
+
+kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
+
+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-tests.sh
+noinst_PROGRAMS += ust_global_event_basic ust_global_all_events_basic test_ust_data_trace
+
+UST_DATA_TRACE=$(top_srcdir)/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)/common/libcommon.la \
+							$(top_builddir)/liblttng-ht/liblttng-ht.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