From 9ff2a538d45790896beff03428f5282ac7005f34 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 6 Jul 2016 10:36:53 +0800 Subject: [PATCH] cmake: pass more env vars to osd-copy-from.sh we should use the cmake function of add_ceph_test() to add osd-copy-from.sh as a test. then we won't miss any env variables. w/o this change, $CEPH_BUILD_VIRTUALENV is not passed to osd-copy-from.sh. Signed-off-by: Kefu Chai --- src/test/osd/CMakeLists.txt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt index b7cb826e3380d9..2ba9fdbfcb093c 100644 --- a/src/test/osd/CMakeLists.txt +++ b/src/test/osd/CMakeLists.txt @@ -24,21 +24,7 @@ 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-snaps.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-scrub-snaps.sh) - -#osd-copy-from.sh needs to be run out of ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -add_test(NAME osd-copy-from.sh COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/osd-copy-from.sh WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) -add_dependencies(check osd-copy-from.sh) - -set_property(TEST - osd-copy-from.sh - PROPERTY ENVIRONMENT - CEPH_ROOT=${CMAKE_SOURCE_DIR} - CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - CEPH_BUILD_DIR=${CMAKE_BINARY_DIR} - LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib - PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH} - PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.linux-x86_64-2.7:${CMAKE_SOURCE_DIR}/src/pybind) +add_ceph_test(osd-copy-from.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-copy-from.sh) # unittest_osdmap add_executable(unittest_osdmap