X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=ea208d70a218edc6250de99942d525c1b6c3cbea;hb=d9078d0c000d04d49c599a72c1a725026b636ec0;hp=67e7fe4545b72aa59904240bcc84a182fea61ccc;hpb=9a3633697faff9b12a64b6d727444eb370fd2340;p=lttng-tools.git

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 67e7fe454..ea208d70a 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -14,10 +14,11 @@ 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
 
+# 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
@@ -27,10 +28,11 @@ 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/uri.o \
-	 $(top_srcdir)/src/common/utils.o \
-	 $(top_srcdir)/src/common/error.o
+	 $(top_srcdir)/src/common/.libs/uri.o \
+	 $(top_srcdir)/src/common/.libs/utils.o \
+	 $(top_srcdir)/src/common/.libs/error.o
 
 test_session_SOURCES = test_session.c
 test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -41,6 +43,7 @@ test_session_LDADD += $(SESSIONS)
 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 \
@@ -49,8 +52,8 @@ UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.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
+		   $(top_srcdir)/src/common/.libs/uri.o \
+		   $(top_srcdir)/src/common/.libs/utils.o
 
 test_ust_data_SOURCES = test_ust_data.c
 test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -62,10 +65,19 @@ endif
 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
+		$(top_srcdir)/src/bin/lttng-sessiond/utils.o \
+		$(top_srcdir)/src/common/.libs/uri.o \
+		$(top_srcdir)/src/common/.libs/utils.o
 
 test_kernel_data_SOURCES = test_kernel_data.c
 test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
 						 -lrt
 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
+
+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)