[lttng-dev] [PATCH lttng-tool] Test: do not run ust dependent tests on make check

Jonathan Rajotte jonathan.rajotte-julien at efficios.com
Thu Jan 22 16:06:44 EST 2015


Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
 configure.ac      | 1 +
 tests/Makefile.am | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index 8d1ff86..954059e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,6 +251,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
 	)
 ])
 AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
+AM_CONDITIONAL([HAVE_LTTNG_UST], [test "x$lttng_ust_support" = xyes])
 AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
 
 # check for dlopen
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f1f1c3..b52d91b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,14 +2,21 @@ SUBDIRS = utils regression unit stress
 
 installcheck-am:
 	./run.sh unit_tests
+
+if HAVE_LTTNG_UST
 	./run.sh fast_regression
+endif
+
 if USE_PYTHON
 	./run.sh with_bindings_regression
 endif
 
 check-am:
 	./run.sh unit_tests
+if HAVE_LTTNG_UST
 	./run.sh fast_regression
+endif
+
 if USE_PYTHON
 	./run.sh with_bindings_regression
 endif
-- 
1.9.1




More information about the lttng-dev mailing list