Merge pull request #9216 from dzafman/wip-test-fix

test: Disable tests due to recovery race
This commit is contained in:
Sage Weil 2016-05-20 14:06:05 -04:00
commit 15a479fbb4
4 changed files with 1 additions and 8 deletions

View File

@ -83,7 +83,6 @@ check_SCRIPTS += \
test/mon/mkfs.sh \
test/mon/mon-scrub.sh \
test/mon/test_pool_quota.sh \
test/osd/osd-scrub-repair.sh \
test/osd/osd-scrub-snaps.sh \
test/osd/osd-config.sh \
test/osd/osd-reuse-id.sh \

View File

@ -1,7 +1,4 @@
add_ceph_test(test-erasure-code.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-erasure-code.sh)
add_ceph_test(test-erasure-eio.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-erasure-eio.sh)
add_executable(ceph_erasure_code_benchmark
${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
ceph_erasure_code_benchmark.cc)

View File

@ -1,9 +1,7 @@
if ENABLE_SERVER
if WITH_OSD
check_SCRIPTS += \
test/erasure-code/test-erasure-code.sh \
test/erasure-code/test-erasure-eio.sh
check_SCRIPTS =
noinst_HEADERS += \
test/erasure-code/ceph_erasure_code_benchmark.h

View File

@ -20,7 +20,6 @@ add_ceph_test(osd-config.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-config.sh)
add_ceph_test(osd-markdown.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-markdown.sh)
add_ceph_test(osd-reactivate.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-reactivate.sh)
add_ceph_test(osd-reuse-id.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-reuse-id.sh)
add_ceph_test(osd-scrub-repair.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-scrub-repair.sh)
add_ceph_test(osd-scrub-snaps.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-scrub-snaps.sh)
#osd-copy-from.sh needs to be run out of ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}