projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable agent application contexts if filter has such dependencies
[lttng-tools.git]
/
tests
/
unit
/
Makefile.am
diff --git
a/tests/unit/Makefile.am
b/tests/unit/Makefile.am
index 83bb8d3515355ec5be531ea264bc757b09014867..7bfe65a8aaf0978851477c16cfb906605155f00c 100644
(file)
--- a/
tests/unit/Makefile.am
+++ b/
tests/unit/Makefile.am
@@
-1,11
+1,13
@@
+SUBDIRS = ini_config
+
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
AM_LDFLAGS =
if LTTNG_TOOLS_BUILD_WITH_LIBDL
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
AM_LDFLAGS =
if LTTNG_TOOLS_BUILD_WITH_LIBDL
-
AM_LDFLAG
S += -ldl
+
LIB
S += -ldl
endif
if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
endif
if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-
AM_LDFLAG
S += -lc
+
LIB
S += -lc
endif
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
endif
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
@@
-16,7
+18,8
@@
LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
# Define test programs
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
+noinst_PROGRAMS = test_uri test_session test_kernel_data
+noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_expand_path
if HAVE_LIBLTTNG_UST_CTL
noinst_PROGRAMS += test_ust_data
if HAVE_LIBLTTNG_UST_CTL
noinst_PROGRAMS += test_ust_data
@@
-30,11
+33,13
@@
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 \
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/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/uri.o \
+ $(top_builddir)/src/common/utils.o \
+ $(top_builddir)/src/common/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) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
test_session_SOURCES = test_session.c
test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
@@
-52,11
+57,13
@@
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/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/session.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/bin/lttng-sessiond/agent.o \
+ $(top_builddir)/src/common/uri.o \
+ $(top_builddir)/src/common/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) $(LIBRELAYD) $(LIBSESSIOND_COMM)\
test_ust_data_SOURCES = test_ust_data.c
test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)\
@@
-67,20
+74,27
@@
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 \
# 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/bin/lttng-sessiond/utils.o \
- $(top_builddir)/src/common/.libs/uri.o \
- $(top_builddir)/src/common/.libs/utils.o
+ $(top_builddir)/src/common/uri.o \
+ $(top_builddir)/src/common/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)
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
+#
utils suffix for
unit test
+UTILS_
SUFFIX=$(top_builddir)/src/common
/utils.o \
+ $(top_builddir)/src/common/runas.o
+# parse_size_suffix unit test
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_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)
+test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
+
+# expand_path unit test
+test_utils_expand_path_SOURCES = test_utils_expand_path.c
+test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
+test_utils_expand_path_LDADD += $(UTILS_SUFFIX)
This page took
0.025359 seconds
and
4
git commands to generate.