X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Funit%2FMakefile.am;h=dd3dd8c159a093d739aab0370a050f1c22a65146;hb=022d91ba14053d6093a6d6a1af02a345c6fd42d2;hp=82f65080de0924236562f70e42da6f5f5ddf0758;hpb=c77d8c84b1100b93c66e9d6d9dac702159069010;p=lttng-tools.git diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 82f65080d..dd3dd8c15 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = ini_config + AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir) AM_LDFLAGS = @@ -17,7 +19,7 @@ LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la # Define test programs noinst_PROGRAMS = test_uri test_session test_kernel_data -noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_resolve_relative +noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_expand_path 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/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 \ @@ -92,7 +94,7 @@ 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) +test_utils_expand_path_LDADD += $(UTILS_SUFFIX)