X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=f517fdcbbc28c6bcfcca07f44b62992801365317;hp=e8a6429d8f8446887df9ca62642e600a6593b396;hb=6dc3064a30b0cc7cfa9fdd22da1963525dfb7388;hpb=70d0b120691e90d81de7b38af8b845e261b5b40c

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index e8a6429d8..f517fdcbb 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -26,12 +26,14 @@ test_uri_SOURCES = test_uri.c
 test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
 
 # Session unit test
-SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.o	\
-	 $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \
-	 $(top_srcdir)/src/bin/lttng-sessiond/health.o \
-	 $(top_srcdir)/src/common/uri.o \
-	 $(top_srcdir)/src/common/utils.o \
-	 $(top_srcdir)/src/common/error.o
+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
 
 test_session_SOURCES = test_session.c
 test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -40,18 +42,20 @@ 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.o \
-	       $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/buffer-registry.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/ust-registry.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/ust-metadata.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/ust-app.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/ust-consumer.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/fd-limit.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/health.o \
-		   $(top_srcdir)/src/bin/lttng-sessiond/session.o \
-		   $(top_srcdir)/src/common/uri.o \
-		   $(top_srcdir)/src/common/utils.o
+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/health.o \
+		   $(top_builddir)/src/bin/lttng-sessiond/session.o \
+		   $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
+		   $(top_builddir)/src/common/.libs/uri.o \
+		   $(top_builddir)/src/common/.libs/utils.o
 
 test_ust_data_SOURCES = test_ust_data.c
 test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -60,11 +64,12 @@ test_ust_data_LDADD += $(UST_DATA_TRACE)
 endif
 
 # Kernel data structures unit test
-KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.o	\
-		$(top_srcdir)/src/bin/lttng-sessiond/consumer.o	\
-		$(top_srcdir)/src/bin/lttng-sessiond/health.o \
-		$(top_srcdir)/src/common/uri.o \
-		$(top_srcdir)/src/common/utils.o
+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
 
 test_kernel_data_SOURCES = test_kernel_data.c
 test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -72,8 +77,8 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTAB
 test_kernel_data_LDADD += $(KERN_DATA_TRACE)
 
 # parse_size_suffix unit test
-UTILS_PARSE_SIZE_SUFFIX=$(top_srcdir)/src/common/utils.o \
-		$(top_srcdir)/src/common/runas.o
+UTILS_PARSE_SIZE_SUFFIX=$(top_builddir)/src/common/.libs/utils.o \
+		$(top_builddir)/src/common/.libs/runas.o
 
 test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c
 test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)