X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=5625cf0fcba42387266e90d05b4a98e5d5169f62;hp=7bfe65a8aaf0978851477c16cfb906605155f00c;hb=8689ad30df1d78a7bc7a6404490e0cdcfb4e0295;hpb=3622d7c3931685fab8d1b2e5585a369b78cefd12

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 7bfe65a8a..5625cf0fc 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -3,6 +3,17 @@ SUBDIRS = ini_config
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 AM_LDFLAGS =
 
+LOG_DRIVER_FLAGS='--merge'
+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
 LIBS += -ldl
 endif
@@ -23,6 +34,7 @@ noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_expand_path
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data
+TESTS += test_ust_data
 endif
 
 # URI unit tests