projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: incorrect error message on metadata missing argument
[lttng-tools.git]
/
tests
/
unit
/
Makefile.am
diff --git
a/tests/unit/Makefile.am
b/tests/unit/Makefile.am
index a38785a1e72014c5c7f39044d88f52831ccc0af0..ee4a37b7f8510d66245072cb5fd717eb0adae5d6 100644
(file)
--- a/
tests/unit/Makefile.am
+++ b/
tests/unit/Makefile.am
@@
-1,7
+1,6
@@
SUBDIRS = ini_config
SUBDIRS = ini_config
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
LOG_DRIVER_FLAGS='--merge'
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
LOG_DRIVER_FLAGS='--merge'
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
@@
-11,17
+10,12
@@
TESTS = test_kernel_data \
test_session \
test_uri \
test_utils_parse_size_suffix \
test_session \
test_uri \
test_utils_parse_size_suffix \
+ test_utils_parse_time_suffix \
test_utils_expand_path \
test_string_utils \
test_utils_expand_path \
test_string_utils \
+ test_notification \
ini_config/test_ini_config
ini_config/test_ini_config
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-LIBS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-LIBS += -lc
-endif
-
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
LIBCOMMON=$(top_builddir)/src/common/libcommon.la
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
LIBCOMMON=$(top_builddir)/src/common/libcommon.la
@@
-29,11
+23,12
@@
LIBSTRINGUTILS=$(top_builddir)/src/common/string-utils/libstring-utils.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
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
+LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
# Define test programs
# Define test programs
-noinst_PROGRAMS = test_uri test_session test_kernel_data
-noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_expand_path
-noinst_PROGRAMS += test_string_utils
+noinst_PROGRAMS = test_uri test_session test_kernel_data
\
+ test_utils_parse_size_suffix test_utils_parse_time_suffix \
+ test_utils_expand_path test_string_utils test_notification
if HAVE_LIBLTTNG_UST_CTL
noinst_PROGRAMS += test_ust_data
if HAVE_LIBLTTNG_UST_CTL
noinst_PROGRAMS += test_ust_data
@@
-42,7
+37,7
@@
endif
# URI unit tests
test_uri_SOURCES = test_uri.c
# URI unit tests
test_uri_SOURCES = test_uri.c
-test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
+test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
$(DL_LIBS)
# Session unit test
SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
# Session unit test
SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
@@
-59,7
+54,7
@@
SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
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) \
- $(LIBHASHTABLE) -lrt
+ $(LIBHASHTABLE)
$(DL_LIBS)
-lrt
test_session_LDADD += $(SESSIONS)
# UST data structures unit test
test_session_LDADD += $(SESSIONS)
# UST data structures unit test
@@
-69,6
+64,7
@@
UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/ust-field-utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-app.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-consumer.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-app.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/ust-consumer.$(OBJEXT) \
@@
-83,7
+79,7
@@
UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
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)\
- $(LIBHASHTABLE) -lrt -llttng-ust-ctl
+ $(LIBHASHTABLE)
$(DL_LIBS)
-lrt -llttng-ust-ctl
test_ust_data_LDADD += $(UST_DATA_TRACE)
endif
test_ust_data_LDADD += $(UST_DATA_TRACE)
endif
@@
-94,11
+90,12
@@
KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
$(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
$(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
- $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
+ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
+ $(LIBLTTNG_CTL)
test_kernel_data_SOURCES = test_kernel_data.c
test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
test_kernel_data_SOURCES = test_kernel_data.c
test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
- $(LIBHASHTABLE) -lrt
+ $(LIBHASHTABLE)
$(DL_LIBS)
-lrt
test_kernel_data_LDADD += $(KERN_DATA_TRACE)
# utils suffix for unit test
test_kernel_data_LDADD += $(KERN_DATA_TRACE)
# utils suffix for unit test
@@
-106,14
+103,23
@@
UTILS_SUFFIX=$(top_builddir)/src/common/libcommon.la
# parse_size_suffix unit test
test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c
# 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_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
$(DL_LIBS)
test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
+# parse_time_suffix unit test
+test_utils_parse_time_suffix_SOURCES = test_utils_parse_time_suffix.c
+test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
+test_utils_parse_time_suffix_LDADD += $(UTILS_SUFFIX)
+
# expand_path unit test
test_utils_expand_path_SOURCES = test_utils_expand_path.c
# 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 = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
$(DL_LIBS)
test_utils_expand_path_LDADD += $(UTILS_SUFFIX)
# string utilities unit test
test_string_utils_SOURCES = test_string_utils.c
test_utils_expand_path_LDADD += $(UTILS_SUFFIX)
# string utilities unit test
test_string_utils_SOURCES = test_string_utils.c
-test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS)
+test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS) $(DL_LIBS)
+
+# Notification api
+test_notification_SOURCES = test_notification.c
+test_notification_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(DL_LIBS)
This page took
0.026977 seconds
and
4
git commands to generate.