projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor: test: wrapper for destroy_lttng_session
[lttng-tools.git]
/
tests
/
unit
/
Makefile.am
diff --git
a/tests/unit/Makefile.am
b/tests/unit/Makefile.am
index fa9c6a86c55726ce9eae06631be3b1ec5542c99a..c0c9c45f5d0de4e478593971123a3db991032136 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
@@
-17,7
+19,7
@@
LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
# Define test programs
noinst_PROGRAMS = test_uri test_session test_kernel_data
# Define test programs
noinst_PROGRAMS = test_uri test_session test_kernel_data
-noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_
resolve_relative test_utils_
expand_path
+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
@@
-57,7
+59,7
@@
UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \
$(top_builddir)/src/bin/lttng-sessiond/fd-limit.o \
$(top_builddir)/src/bin/lttng-sessiond/session.o \
$(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
$(top_builddir)/src/bin/lttng-sessiond/fd-limit.o \
$(top_builddir)/src/bin/lttng-sessiond/session.o \
$(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
- $(top_builddir)/src/bin/lttng-sessiond/
jul
.o \
+ $(top_builddir)/src/bin/lttng-sessiond/
agent
.o \
$(top_builddir)/src/common/.libs/uri.o \
$(top_builddir)/src/common/.libs/utils.o \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/.libs/uri.o \
$(top_builddir)/src/common/.libs/utils.o \
$(top_builddir)/src/common/health/libhealth.la \
@@
-92,11
+94,6
@@
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_SUFFIX)
test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
-# resolve_relative unit test
-test_utils_resolve_relative_SOURCES = test_utils_resolve_relative.c
-test_utils_resolve_relative_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
-test_utils_resolve_relative_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)
# expand_path unit test
test_utils_expand_path_SOURCES = test_utils_expand_path.c
test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
This page took
0.023963 seconds
and
4
git commands to generate.