X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=ec8d22f620638f8580f60af1b99e48a6845f47a5;hp=a8dec2bd96e91aa25da8e841d590a3d2717fd676;hb=1501a7f32e1abf3e805053d4241c9796882d56bc;hpb=0475c50c4d3d2cea973fe4d1f17875d231dea96c diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index a8dec2bd9..ec8d22f62 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 = @@ -16,7 +18,8 @@ LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la 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 @@ -82,10 +85,16 @@ 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 \ +# utils suffix for unit test +UTILS_SUFFIX=$(top_builddir)/src/common/.libs/utils.o \ $(top_builddir)/src/common/.libs/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_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)