Activate streaming tests in make check

[lttng-tools.git] / tests / tools / Makefile.am

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index 88e86f71ad91b715480c3b4f4c0f08dcbd57287a..f4cfe57b9ffa2f332b46038563fd7d084b4c9aaf 100644 (file)
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = streaming
+
 AM_CFLAGS = -g -Wall -I../
 AM_LDFLAGS = -lurcu -lurcu-cds
 
@@ -5,11 +7,15 @@ EXTRA_DIST = runall.sh
 
 noinst_PROGRAMS = test_sessions test_kernel_data_trace
 
-UTILS=utils.h
+UTILS=../utils.h
 SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c
+KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c \
+                               $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
+                               $(top_srcdir)/src/common/uri.c \
+                               $(top_srcdir)/src/common/utils.c
 COMMON=$(top_builddir)/src/common/libcommon.la
 HASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
+SESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
 # Tracing sessions unit tests
 test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
@@ -17,11 +23,15 @@ test_sessions_LDADD = $(COMMON) $(HASHTABLE)
 
 # Kernel trace data unit tests
 test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
+test_kernel_data_trace_LDADD = $(SESSIOND_COMM) $(HASHTABLE)
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data_trace
-UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c
+UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c \
+                          $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
+                          $(top_srcdir)/src/common/uri.c \
+                          $(top_srcdir)/src/common/utils.c
 # UST trace data unit tests
 test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
-test_ust_data_trace_LDADD = $(COMMON) $(HASHTABLE)
+test_ust_data_trace_LDADD = $(COMMON) $(HASHTABLE) $(SESSIOND_COMM)
 endif