From 5b14e2839297070f66b4538cbbec6fc04580d033 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 13 Jul 2016 21:15:32 +0800 Subject: [PATCH] cmake: no need to depend run-tox-ceph-disk on test run-tox-ceph-disk and run-tox-ceph-detect-init are already added as test, so "ctest" and "make {test,check}" will run them without extra settings. Signed-off-by: Kefu Chai --- src/test/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 71f65613324..0363afb40c6 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -521,10 +521,7 @@ add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh) add_ceph_test(unittest_bufferlist.sh ${CMAKE_SOURCE_DIR}/src/unittest_bufferlist.sh) add_test(NAME run-tox-ceph-disk COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-disk/run-tox.sh) -add_dependencies(check run-tox-ceph-disk) - -add_test(NAME run-tox-ceph-detect-init COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-detect-init/run-tox.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src) -add_dependencies(check run-tox-ceph-detect-init) +add_test(NAME run-tox-ceph-detect-init COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-detect-init/run-tox.sh) set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv) set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv) -- 2.47.3