From 6529d7f67e05903ca29347c3220a0c91ce1f2905 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Mon, 3 Jan 2011 08:39:22 -0500
Subject: Pass the expected value as the first argument

When the path has regular expression special characters, the
PASS_REGULAR_EXPRESSION value can fail to compile.
---
 Tests/TestsWorkingDirectory/CMakeLists.txt | 26 ++++++--------------------
 Tests/TestsWorkingDirectory/main.c         |  4 +---
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/Tests/TestsWorkingDirectory/CMakeLists.txt b/Tests/TestsWorkingDirectory/CMakeLists.txt
index 01e6650..0fef19d 100644
--- a/Tests/TestsWorkingDirectory/CMakeLists.txt
+++ b/Tests/TestsWorkingDirectory/CMakeLists.txt
@@ -7,46 +7,32 @@ enable_testing()
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
 
-add_test(NAME WorkingDirectory1 COMMAND WorkingDirectory)
+add_test(NAME WorkingDirectory1 COMMAND WorkingDirectory "${CMAKE_BINARY_DIR}")
 set_tests_properties(WorkingDirectory1 PROPERTIES
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
-  PASS_REGULAR_EXPRESSION "Working directory: -->${CMAKE_BINARY_DIR}<--"
 )
 
 string(REGEX REPLACE "/[^/]*$" "" _parent_dir "${CMAKE_BINARY_DIR}")
 
-add_test(NAME WorkingDirectory2 COMMAND WorkingDirectory)
+add_test(NAME WorkingDirectory2 COMMAND WorkingDirectory "${_parent_dir}")
 set_tests_properties(WorkingDirectory2 PROPERTIES
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/.."
-  PASS_REGULAR_EXPRESSION "Working directory: -->${_parent_dir}<--"
 )
 
 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")
-add_test(WorkingDirectory3 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory)
-set_tests_properties(WorkingDirectory3 PROPERTIES
-  PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--"
-)
+add_test(WorkingDirectory3 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory ${_default_cwd})
 endif()
 
-add_test(NAME WorkingDirectory4 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND WorkingDirectory)
-set_tests_properties(WorkingDirectory4 PROPERTIES
-  PASS_REGULAR_EXPRESSION "Working directory: -->${CMAKE_BINARY_DIR}<--"
-)
+add_test(NAME WorkingDirectory4 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND WorkingDirectory ${CMAKE_BINARY_DIR})
 
 string(REGEX REPLACE "/[^/]*$" "" _parent_dir "${CMAKE_BINARY_DIR}")
 
-add_test(NAME WorkingDirectory5 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/.. COMMAND WorkingDirectory)
-set_tests_properties(WorkingDirectory5 PROPERTIES
-  PASS_REGULAR_EXPRESSION "Working directory: -->${_parent_dir}<--"
-)
+add_test(NAME WorkingDirectory5 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/.. COMMAND WorkingDirectory ${_parent_dir})
 
 # FIXME: How to deal with /debug, /release, etc. with VS or XCode?
 if(${CMAKE_GENERATOR} MATCHES "Makefiles")
-add_test(WorkingDirectory6 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..)
-set_tests_properties(WorkingDirectory6 PROPERTIES
-  PASS_REGULAR_EXPRESSION "Working directory: -->${_default_cwd}<--"
-)
+add_test(WorkingDirectory6 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory ${_default_cwd} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..)
 endif()
diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c
index ad5eb30..19f2f14 100644
--- a/Tests/TestsWorkingDirectory/main.c
+++ b/Tests/TestsWorkingDirectory/main.c
@@ -60,7 +60,5 @@ int main(int argc, char *argv[])
   char buf[2048];
   const char *cwd = Getcwd(buf, sizeof(buf));
 
-  fprintf(stdout, "Working directory: -->%s<--", cwd);
-
-  return 0;
+  return strcmp(cwd, argv[1]);
 }
-- 
cgit v0.12