From 07ed853f33e3cdba5da7da3e410623f8c43606d8 Mon Sep 17 00:00:00 2001 From: Ceph Maintainers Date: Sun, 30 Jul 2017 10:48:17 +0100 Subject: [PATCH] tests-disable Gbp-Pq: Name tests-disable.patch --- configure.ac | 7 +++++++ src/test/Makefile.am | 3 +++ src/test/erasure-code/Makefile.am | 2 ++ 3 files changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index 68647b6c6..e3033896b 100644 --- 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 ce6fc2048..fba73e519 100644 --- 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 f2d2b28c1..454a405f8 100644 --- 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 -- 2.30.2