Browse Source

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.
Brad King 15 years ago
parent
commit
2de33ebd58
2 changed files with 3 additions and 2 deletions
  1. 1 0
      Tests/CTestUpdateCVS.cmake.in
  2. 2 2
      Tests/CTestUpdateCommon.cmake

+ 1 - 0
Tests/CTestUpdateCVS.cmake.in

@@ -6,6 +6,7 @@
 get_filename_component(TOP "${CMAKE_CURRENT_LIST_FILE}" PATH)
 get_filename_component(TOP "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(TOP "${TOP}/@CTestUpdateCVS_DIR@")
 set(TOP "${TOP}/@CTestUpdateCVS_DIR@")
 set(UPDATE_NOT_GLOBAL 1)
 set(UPDATE_NOT_GLOBAL 1)
+set(UPDATE_MAYBE Updated{CTestConfig.cmake})
 
 
 # Include code common to all update tests.
 # Include code common to all update tests.
 include("@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake")
 include("@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake")

+ 2 - 2
Tests/CTestUpdateCommon.cmake

@@ -190,7 +190,7 @@ function(run_dashboard_command_line bin_dir)
     )
     )
 
 
   # Verify the updates reported by CTest.
   # Verify the updates reported by CTest.
-  set(UPDATE_MAYBE Updated{subdir})
+  list(APPEND UPDATE_MAYBE Updated{subdir})
   check_updates(${bin_dir}
   check_updates(${bin_dir}
     Updated{foo.txt}
     Updated{foo.txt}
     Updated{bar.txt}
     Updated{bar.txt}
@@ -210,7 +210,7 @@ function(run_dashboard_script name)
     )
     )
 
 
   # Verify the updates reported by CTest.
   # Verify the updates reported by CTest.
-  set(UPDATE_MAYBE Updated{subdir})
+  list(APPEND UPDATE_MAYBE Updated{subdir})
   check_updates(dash-binary
   check_updates(dash-binary
     Updated{foo.txt}
     Updated{foo.txt}
     Updated{bar.txt}
     Updated{bar.txt}