Add jul.c/.h to sessiond code

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

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b48917b90e81f70e2a3147f7f1c59af8d553d833..a8dec2bd96e91aa25da8e841d590a3d2717fd676 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -13,45 +13,79 @@ LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 LIBCOMMON=$(top_builddir)/src/common/libcommon.la
 LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
+LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
 
-EXTRA_DIST = run.sh
+# Define test programs
+noinst_PROGRAMS = test_uri test_session        test_kernel_data test_utils_parse_size_suffix
 
 if HAVE_LIBLTTNG_UST_CTL
-noinst_PROGRAMS = test_uri test_session test_ust_data test_kernel_data
-else
-noinst_PROGRAMS = test_uri test_session        test_kernel_data
+noinst_PROGRAMS += test_ust_data
 endif
 
 # URI unit tests
 test_uri_SOURCES = test_uri.c
-test_uri_LDADD = $(LIBCOMMON)
+test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
 
 # Session unit test
-SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c        \
-        $(top_srcdir)/src/bin/lttng-sessiond/consumer.c        \
-        $(top_srcdir)/src/common/uri.c                         \
-        $(top_srcdir)/src/common/utils.c                       \
-        $(top_srcdir)/src/common/error.c
+SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.o      \
+        $(top_builddir)/src/bin/lttng-sessiond/consumer.o \
+        $(top_builddir)/src/bin/lttng-sessiond/utils.o \
+        $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
+        $(top_builddir)/src/common/.libs/uri.o \
+        $(top_builddir)/src/common/.libs/utils.o \
+        $(top_builddir)/src/common/.libs/error.o \
+        $(top_builddir)/src/common/health/libhealth.la \
+        $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
-test_session_SOURCES = test_session.c $(SESSIONS)
-test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+
+test_session_SOURCES = test_session.c
+test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
+                    $(LIBHASHTABLE) -lrt
+test_session_LDADD += $(SESSIONS)
 
 # UST data structures unit test
 if HAVE_LIBLTTNG_UST_CTL
-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_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \
+              $(top_builddir)/src/bin/lttng-sessiond/consumer.o \
+              $(top_builddir)/src/bin/lttng-sessiond/utils.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/ust-registry.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/ust-app.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/ust-consumer.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/fd-limit.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/session.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
+                  $(top_builddir)/src/bin/lttng-sessiond/jul.o \
+                  $(top_builddir)/src/common/.libs/uri.o \
+                  $(top_builddir)/src/common/.libs/utils.o \
+                  $(top_builddir)/src/common/health/libhealth.la \
+                  $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
-test_ust_data_SOURCES = test_ust_data.c $(UST_DATA_TRACE)
-test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+test_ust_data_SOURCES = test_ust_data.c
+test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)\
+                     $(LIBHASHTABLE) -lrt -llttng-ust-ctl
+test_ust_data_LDADD += $(UST_DATA_TRACE)
 endif
 
 # Kernel data structures unit test
-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
+KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.o  \
+               $(top_builddir)/src/bin/lttng-sessiond/consumer.o       \
+               $(top_builddir)/src/bin/lttng-sessiond/utils.o \
+               $(top_builddir)/src/common/.libs/uri.o \
+               $(top_builddir)/src/common/.libs/utils.o \
+               $(top_builddir)/src/common/health/libhealth.la \
+               $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
+
+test_kernel_data_SOURCES = test_kernel_data.c
+test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
+                        $(LIBHASHTABLE) -lrt
+test_kernel_data_LDADD += $(KERN_DATA_TRACE)
+
+# parse_size_suffix unit test
+UTILS_PARSE_SIZE_SUFFIX=$(top_builddir)/src/common/.libs/utils.o \
+               $(top_builddir)/src/common/.libs/runas.o
 
-test_kernel_data_SOURCES = test_kernel_data.c $(KERN_DATA_TRACE)
-test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c
+test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
+test_utils_parse_size_suffix_LDADD += $(UTILS_PARSE_SIZE_SUFFIX)