projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Replace prove by autotools tap runner
[lttng-tools.git]
/
tests
/
unit
/
Makefile.am
diff --git
a/tests/unit/Makefile.am
b/tests/unit/Makefile.am
index fa9c6a86c55726ce9eae06631be3b1ec5542c99a..b7f318fccc19f62093ad82ec7a8bf3144546eef2 100644
(file)
--- a/
tests/unit/Makefile.am
+++ b/
tests/unit/Makefile.am
@@
-1,11
+1,23
@@
+SUBDIRS = ini_config
+
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
AM_LDFLAGS =
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
AM_LDFLAGS =
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+ $(top_srcdir)/config/tap-driver.sh
+
+TESTS = test_kernel_data \
+ test_session \
+ test_uri \
+ test_utils_parse_size_suffix \
+ test_utils_expand_path \
+ ini_config/test_ini_config
+
if LTTNG_TOOLS_BUILD_WITH_LIBDL
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,10
+29,11
@@
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
+TESTS += test_ust_data
endif
# URI unit tests
endif
# URI unit tests
@@
-32,9
+45,9
@@
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/snapshot.o \
$(top_builddir)/src/bin/lttng-sessiond/consumer.o \
$(top_builddir)/src/bin/lttng-sessiond/utils.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
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
@@
-57,9
+70,9
@@
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/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
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
@@
-73,8
+86,8
@@
endif
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/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/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
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
@@
-84,19
+97,14
@@
test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)
test_kernel_data_LDADD += $(KERN_DATA_TRACE)
# utils suffix for unit test
test_kernel_data_LDADD += $(KERN_DATA_TRACE)
# utils suffix for unit test
-UTILS_SUFFIX=$(top_builddir)/src/common/
.libs/
utils.o \
- $(top_builddir)/src/common/
.libs/
runas.o
+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_LDADD += $(UTILS_SUFFIX)
# 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 += $(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.026204 seconds
and
4
git commands to generate.