From: David Goulet <dgoulet@efficios.com>
Date: Tue, 25 Jun 2013 21:25:04 +0000 (-0400)
Subject: Fix: build path for unit test to build out of tree
X-Git-Tag: v2.2.0~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f17896506217837e40b6b8aa3c64594c9370d34b;p=lttng-tools.git

Fix: build path for unit test to build out of tree

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index ea208d70a..256951223 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -26,13 +26,13 @@ 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/utils.o \
-	 $(top_srcdir)/src/bin/lttng-sessiond/health.o \
-	 $(top_srcdir)/src/common/.libs/uri.o \
-	 $(top_srcdir)/src/common/.libs/utils.o \
-	 $(top_srcdir)/src/common/.libs/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/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) \
@@ -41,19 +41,19 @@ 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/utils.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/.libs/uri.o \
-		   $(top_srcdir)/src/common/.libs/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/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) \
@@ -62,12 +62,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/bin/lttng-sessiond/utils.o \
-		$(top_srcdir)/src/common/.libs/uri.o \
-		$(top_srcdir)/src/common/.libs/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) \
@@ -75,8 +75,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/.libs/utils.o \
-		$(top_srcdir)/src/common/.libs/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)