tests-disable

Gbp-Pq: Name tests-disable.patch

diff --git a/configure.ac b/configure.ac
index 68647b6c679773afd529d956315d3c16dae50f81..e3033896b19929dfe7bf7f6910046d513a252341 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1349,6 +1349,13 @@ AC_LANG_POP([C++])
 
 AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
 
+AC_ARG_WITH([cluster-tests],
+    [AS_HELP_STRING([--with-cluster-tests], [enables cluster tests])],
+    [],
+    [with_cluster_tests=no]
+)
+AM_CONDITIONAL(WITH_CLUSTER_TESTS, [ test "$with_cluster_tests" = "yes" ])
+
 AM_PATH_PYTHON([2.4],
        [], [AC_MSG_FAILURE([Failed to find Python 2.4 or newer])])
 

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index ce6fc2048f7bf0e0aed04f60179a79336a793264..fba73e519fa27d184dabdb1748e1b94068f83706 100644 (file)
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -100,6 +100,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
 
 ## Unit tests
 
+if WITH_CLUSTER_TESTS
 check_SCRIPTS += \
        test/ceph_objectstore_tool.py \
        test/test-ceph-helpers.sh \
@@ -133,6 +134,8 @@ check_SCRIPTS += \
         test/test_pidfile.sh \
        test/test_subman.sh
 
+endif
+
 EXTRA_DIST += \
        $(srcdir)/test/python/brag-client/setup.py \
        $(srcdir)/test/python/brag-client/tox.ini \

diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
index f2d2b28c10de5c062b9c9513ef9f9374c4c72378..454a405f83f78f39a25e75c05c46e44d1a636414 100644 (file)
--- a/src/test/erasure-code/Makefile.am
+++ b/src/test/erasure-code/Makefile.am
@@ -1,9 +1,11 @@
 if ENABLE_SERVER
 if WITH_OSD
 
+if WITH_CLUSTER_TESTS
 check_SCRIPTS += \
        test/erasure-code/test-erasure-code.sh \
        test/erasure-code/test-erasure-eio.sh
+endif
 
 noinst_HEADERS += \
        test/erasure-code/ceph_erasure_code_benchmark.h