diff --git a/cmake/configure.cmake b/cmake/configure.cmake index 131d4b59b..5f5a73b01 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -25,7 +25,13 @@ else () endif () set(CMAKE_COMPILE_WARNING_AS_ERROR ON) -set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) + +if (USE_COVERAGE) + set(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib") +else() + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +endif () + set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) set(CMAKE_SKIP_BUILD_RPATH OFF) diff --git a/scripts/run_tests.py b/scripts/run_tests.py index 2b10c9451..6c949e0e1 100644 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -59,7 +59,10 @@ def __source_script(script_path): return {} def setup_env(self): - self.work_dir = Path(self.__get_project_path()) / "install" / "bin" + if (Path(self.__get_project_path()) / "install").exists(): + self.work_dir = Path(self.__get_project_path()) / "install" / "bin" + else: + self.work_dir = Path(self.__get_project_path()) / "build" / "bin" @staticmethod def __run_exec(command):