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.
This commit is contained in:
parent
d87bae7f74
commit
561cc3359c
|
@ -25,9 +25,12 @@ set_tests_properties(WorkingDirectory2 PROPERTIES
|
||||||
|
|
||||||
get_filename_component(_default_cwd "${EXECUTABLE_OUTPUT_PATH}" PATH)
|
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
|
set_tests_properties(WorkingDirectory3 PROPERTIES
|
||||||
PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--"
|
PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--"
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_test(NAME WorkingDirectory4 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND WorkingDirectory)
|
add_test(NAME WorkingDirectory4 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND WorkingDirectory)
|
||||||
add_test(NAME WorkingDirectory5 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}<--"
|
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
|
set_tests_properties(WorkingDirectory6 PROPERTIES
|
||||||
PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--"
|
PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--"
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue