From 561cc3359cca42749f797dd5ea908531740a873d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 17 Dec 2010 10:24:14 -0500 Subject: [PATCH] Only test the default cwd with Makefiles XCode and Visual Studio generators can run from ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE} and determining this at testing time is not feasible without adding in more PASS_REGULAR_EXPRESSION's which may create false positives. Since the parsing code is in cross-platform, generator-agnostic code, if it passes with Makefiles, it should work with other generators on other platforms. --- Tests/TestsWorkingDirectory/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tests/TestsWorkingDirectory/CMakeLists.txt b/Tests/TestsWorkingDirectory/CMakeLists.txt index d1c40d6cb..bd52cd66e 100644 --- a/Tests/TestsWorkingDirectory/CMakeLists.txt +++ b/Tests/TestsWorkingDirectory/CMakeLists.txt @@ -25,9 +25,12 @@ set_tests_properties(WorkingDirectory2 PROPERTIES get_filename_component(_default_cwd "${EXECUTABLE_OUTPUT_PATH}" PATH) +# FIXME: How to deal with /debug, /release, etc. with VS or XCode? +if(${CMAKE_GENERATOR} MATCHES "Makefiles") set_tests_properties(WorkingDirectory3 PROPERTIES PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--" ) +endif() add_test(NAME WorkingDirectory4 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND WorkingDirectory) add_test(NAME WorkingDirectory5 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/.. COMMAND WorkingDirectory) @@ -43,6 +46,9 @@ set_tests_properties(WorkingDirectory5 PROPERTIES PASS_REGULAR_EXPRESSION "Working directory: -->${_parent_dir}<--" ) +# FIXME: How to deal with /debug, /release, etc. with VS or XCode? +if(${CMAKE_GENERATOR} MATCHES "Makefiles") set_tests_properties(WorkingDirectory6 PROPERTIES PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--" ) +endif()