[Cmake-commits] [cmake-commits] king committed CTestUpdateCVS.cmake.in 1.2 1.3 CTestUpdateCommon.cmake 1.4 1.5 CTestUpdateSVN.cmake.in 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	CTestUpdateCVS.cmake.in CTestUpdateCommon.cmake 
	CTestUpdateSVN.cmake.in 
Log Message:
ENH: Extend CTest.UpdateSVN to test local mods

This teaches the test to create local modifications in the work tree
before updating.


Index: CTestUpdateSVN.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateSVN.cmake.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CTestUpdateSVN.cmake.in	23 Feb 2009 20:59:20 -0000	1.3
--- CTestUpdateSVN.cmake.in	26 Feb 2009 14:22:16 -0000	1.4
***************
*** 104,107 ****
--- 104,110 ----
    )
  
+ # Create a modified file.
+ modify_content(user-source)
+ 
  #-----------------------------------------------------------------------------
  # Test updating the user work directory with the command-line interface.

Index: CTestUpdateCVS.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateCVS.cmake.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CTestUpdateCVS.cmake.in	23 Feb 2009 20:59:07 -0000	1.2
--- CTestUpdateCVS.cmake.in	26 Feb 2009 14:22:14 -0000	1.3
***************
*** 103,106 ****
--- 103,109 ----
    )
  
+ # Create a modified file.
+ modify_content(user-source)
+ 
  #-----------------------------------------------------------------------------
  # Test updating the user work directory with the command-line interface.

Index: CTestUpdateCommon.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateCommon.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CTestUpdateCommon.cmake	23 Feb 2009 21:54:53 -0000	1.4
--- CTestUpdateCommon.cmake	26 Feb 2009 14:22:16 -0000	1.5
***************
*** 111,114 ****
--- 111,120 ----
  
  #-----------------------------------------------------------------------------
+ # Function to create local modifications before update
+ function(modify_content dir)
+   file(APPEND ${TOP}/${dir}/CTestConfig.cmake "# local modification\n")
+ endfunction(modify_content)
+ 
+ #-----------------------------------------------------------------------------
  # Function to write CTestConfiguration.ini content.
  function(create_build_tree src_dir bin_dir)
***************
*** 150,154 ****
  
    # Verify the updates reported by CTest.
!   check_updates(${bin_dir} foo.txt bar.txt zot.txt
                             subdir/foo.txt subdir/bar.txt)
  endfunction(run_dashboard_command_line)
--- 156,160 ----
  
    # Verify the updates reported by CTest.
!   check_updates(${bin_dir} foo.txt bar.txt zot.txt CTestConfig.cmake
                             subdir/foo.txt subdir/bar.txt)
  endfunction(run_dashboard_command_line)