From: Kefu Chai Date: Wed, 13 Jul 2016 13:15:32 +0000 (+0800) Subject: cmake: no need to depend run-tox-ceph-disk on test X-Git-Tag: ses5-milestone5~376^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b14e2839297070f66b4538cbbec6fc04580d033;p=ceph.git 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 --- diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 71f656133240..0363afb40c6e 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)