From 1fceb344bef86895b8e449aeec2f369eb929c5d3 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Fri, 20 May 2016 11:51:21 -0700 Subject: [PATCH] Revert "test: Disable tests due to recovery race" This reverts commit 5bc55338f5a1645bc651811fae2f89ad855ff86e. Conflicts: src/test/Makefile.am (no longer exists) src/test/erasure-code/Makefile.am (no longer exists) Signed-off-by: David Zafman --- src/test/erasure-code/CMakeLists.txt | 3 +++ src/test/osd/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt index 2d8b3e3bb08..245fdb8a720 100644 --- a/src/test/erasure-code/CMakeLists.txt +++ b/src/test/erasure-code/CMakeLists.txt @@ -1,5 +1,8 @@ add_ceph_test(test-erasure-code-plugins.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-erasure-code-plugins.sh) +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) diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt index 30d02179720..8e5f1332abd 100644 --- a/src/test/osd/CMakeLists.txt +++ b/src/test/osd/CMakeLists.txt @@ -23,6 +23,7 @@ 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) add_ceph_test(osd-copy-from.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-copy-from.sh) add_ceph_test(osd-fast-mark-down.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-fast-mark-down.sh) -- 2.47.3