From c9121167d0d07e59f05ff7171a02e3374b9e7153 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 7 Oct 2014 21:18:00 +0200 Subject: [PATCH] autotools: add --enable-docker Docker based tests should be explicit instead of auto-detected. It is good that they do not run if docker is not available. It would be bad if they run when the developer does not expect them to create docker containers. Signed-off-by: Loic Dachary --- configure.ac | 6 ++++++ src/test/Makefile.am | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dcd42b093ec4..28e057467361 100644 --- a/configure.ac +++ b/configure.ac @@ -310,6 +310,12 @@ AM_CONDITIONAL(WITH_DEBUG, test "$with_debug" = "yes") AC_DEFINE([DEBUG_GATHER], [1], [Define if you want C_Gather debugging]) +AC_ARG_ENABLE([docker], + [AS_HELP_STRING([--enable-docker], [enable docker based functional tests])], + [], + [enable_docker=no]) +AM_CONDITIONAL(ENABLE_DOCKER, test "x$enable_docker" != xno) + # code coverage? AC_ARG_ENABLE([coverage], [AS_HELP_STRING([--enable-coverage], [enable code coverage tracking])], diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 7b07de399181..c114a9c7b9e0 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -251,9 +251,13 @@ check_SCRIPTS += \ test/osd/osd-config.sh \ test/osd/osd-bench.sh \ test/ceph-disk.sh \ - test/ceph-disk-root.sh \ test/mon/mon-handle-forward.sh +if ENABLE_DOCKER +check_SCRIPTS += \ + test/ceph-disk-root.sh +endif + EXTRA_DIST += \ $(srcdir)/test/mon/mon-test-helpers.sh \ $(srcdir)/test/osd/osd-test-helpers.sh \ -- 2.47.3