[Cmake-commits] [cmake-commits] king committed CTestUpdateCVS.cmake.in 1.7 1.8 CTestUpdateCommon.cmake 1.9 1.10

[cmake-commits at cmake.org]

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

Modified Files:
	CTestUpdateCVS.cmake.in CTestUpdateCommon.cmake 
Log Message:
Make CTest.UpdateCVS robust to some cvs clients

Commit "Teach CTest.Update tests to strongly check entries" (2010-02-09)
started checking Update.xml entries strongly.  This revealed that some
cvs clients report "U CTestConfig.cmake" during update even though the
file did not change and it selects the same revision.  As a result the
test fails with

  Update.xml has extra unexpected entries:

    Updated{CTestConfig.cmake}

We fix the test to tolerate this particular extra entry without failing.


Index: CTestUpdateCVS.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateCVS.cmake.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CTestUpdateCVS.cmake.in	18 Dec 2009 13:13:51 -0000	1.7
--- CTestUpdateCVS.cmake.in	10 Feb 2010 16:48:09 -0000	1.8
***************
*** 7,10 ****
--- 7,11 ----
  set(TOP "${TOP}/@CTestUpdateCVS_DIR@")
  set(UPDATE_NOT_GLOBAL 1)
+ set(UPDATE_MAYBE Updated{CTestConfig.cmake})
  
  # Include code common to all update tests.

Index: CTestUpdateCommon.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateCommon.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CTestUpdateCommon.cmake	9 Feb 2010 18:31:20 -0000	1.9
--- CTestUpdateCommon.cmake	10 Feb 2010 16:48:09 -0000	1.10
***************
*** 191,195 ****
  
    # Verify the updates reported by CTest.
!   set(UPDATE_MAYBE Updated{subdir})
    check_updates(${bin_dir}
      Updated{foo.txt}
--- 191,195 ----
  
    # Verify the updates reported by CTest.
!   list(APPEND UPDATE_MAYBE Updated{subdir})
    check_updates(${bin_dir}
      Updated{foo.txt}
***************
*** 211,215 ****
  
    # Verify the updates reported by CTest.
!   set(UPDATE_MAYBE Updated{subdir})
    check_updates(dash-binary
      Updated{foo.txt}
--- 211,215 ----
  
    # Verify the updates reported by CTest.
!   list(APPEND UPDATE_MAYBE Updated{subdir})
    check_updates(dash-binary
      Updated{foo.txt}