From: Loic Dachary <loic-201408@dachary.org>
Date: Tue, 7 Oct 2014 19:18:00 +0000 (+0200)
Subject: autotools: add --enable-docker
X-Git-Tag: v0.90~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2648%2Fhead;p=ceph.git

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 <loic-201408@dachary.org>
---

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 \