From: Ali Maredia <amaredia@redhat.com>
Date: Wed, 27 Apr 2016 19:27:38 +0000 (-0400)
Subject: cmake: update env vars for osd-copy-from.sh
X-Git-Tag: v11.0.0~766^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a6723e462a56655018427c3f8991cbab23840c5c;p=ceph-ci.git

cmake: update env vars for osd-copy-from.sh

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt
index 841bab166a0..d7cdb7eea8a 100644
--- a/src/test/osd/CMakeLists.txt
+++ b/src/test/osd/CMakeLists.txt
@@ -33,11 +33,10 @@ set_property(TEST
   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=$ENV{PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src
-  PYTHONPATH=${CMAKE_SOURCE_DIR}/src/pybind
-  )
-
+  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)
 
 # unittest_osdmap
 add_executable(unittest_osdmap EXCLUDE_FROM_ALL