X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=a8dec2bd96e91aa25da8e841d590a3d2717fd676;hp=2569512239365870dcdc1abaefea70ac310384ae;hb=0475c50c4d3d2cea973fe4d1f17875d231dea96c;hpb=f17896506217837e40b6b8aa3c64594c9370d34b diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 256951223..a8dec2bd9 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -13,6 +13,7 @@ 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 # Define test programs noinst_PROGRAMS = test_uri test_session test_kernel_data test_utils_parse_size_suffix @@ -29,14 +30,17 @@ test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) 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/health.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/.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 -test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt +test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ + $(LIBHASHTABLE) -lrt test_session_LDADD += $(SESSIONS) # UST data structures unit test @@ -50,28 +54,32 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.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/health.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/.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 -test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt -llttng-ust-ctl +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_builddir)/src/bin/lttng-sessiond/trace-kernel.o \ $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ - $(top_builddir)/src/bin/lttng-sessiond/health.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/.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) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt +test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ + $(LIBHASHTABLE) -lrt test_kernel_data_LDADD += $(KERN_DATA_TRACE) # parse_size_suffix unit test