[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.23 1.24 CheckSourceTreeTest.cmake.in 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/CMakeTests
In directory public:/mounts/ram/cvs-serv7406/Tests/CMakeTests

Modified Files:
	CMakeLists.txt CheckSourceTreeTest.cmake.in 
Log Message:
Fix cvs password problems during the CMake.CheckSourceTree test. Make sure cvs has access to the original value of the HOME environment variable and not the 'CMake testing' value of it so that any cvs passwords set up on the machine work to get the list of local modifications using 'cvs up'...


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/CMakeLists.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** CMakeLists.txt	27 Oct 2009 18:01:16 -0000	1.23
--- CMakeLists.txt	4 Dec 2009 19:50:37 -0000	1.24
***************
*** 51,54 ****
--- 51,55 ----
      "-DCMake_SOURCE_DIR:PATH=${CMake_SOURCE_DIR}"
      "-DCVS_EXECUTABLE:STRING=${CVS_EXECUTABLE}"
+     "-DHOME:STRING=$ENV{HOME}"
      )
    AddCMakeTest(CheckSourceTree "${CheckSourceTree_PreArgs}")

Index: CheckSourceTreeTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/CheckSourceTreeTest.cmake.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CheckSourceTreeTest.cmake.in	27 Jul 2009 16:04:03 -0000	1.4
--- CheckSourceTreeTest.cmake.in	4 Dec 2009 19:50:37 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  message("CMake_SOURCE_DIR='${CMake_SOURCE_DIR}'")
  message("CVS_EXECUTABLE='${CVS_EXECUTABLE}'")
+ message("HOME='${HOME}'")
  message("ENV{DASHBOARD_TEST_FROM_CTEST}='$ENV{DASHBOARD_TEST_FROM_CTEST}'")
  message("")
***************
*** 48,51 ****
--- 49,59 ----
  message("cd \"${CMake_SOURCE_DIR}\" && \"${CVS_EXECUTABLE}\" -q -n up -dP")
  message("")
+ 
+ # Use the HOME value passed in to the script for calling cvs so it can find
+ # its .cvspass and other file(s)
+ #
+ set(original_ENV_HOME "$ENV{HOME}")
+ set(ENV{HOME} "${HOME}")
+ 
  execute_process(COMMAND ${CVS_EXECUTABLE} -q -n up -dP
    WORKING_DIRECTORY ${CMake_SOURCE_DIR}
***************
*** 54,57 ****
--- 62,67 ----
    RESULT_VARIABLE rv)
  
+ set(ENV{HOME} "${original_ENV_HOME}")
+ 
  message("Results of running '${CVS_EXECUTABLE} -q -n up -dP'")
  message("rv='${rv}'")
***************
*** 60,63 ****
--- 70,77 ----
  message("")
  
+ if(NOT rv STREQUAL 0)
+   message(FATAL_ERROR "error: 'cvs -q -n up -dP' attempt failed... (see output above)")
+ endif()
+ 
  # Analyze cvs output:
  #