From 2de33ebd5849cfa8819718638ab94213004c6f2d Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 10 Feb 2010 11:48:09 -0500 Subject: 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. --- Tests/CTestUpdateCVS.cmake.in | 1 + Tests/CTestUpdateCommon.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/CTestUpdateCVS.cmake.in b/Tests/CTestUpdateCVS.cmake.in index 1509adf..6f31a2c 100644 --- a/Tests/CTestUpdateCVS.cmake.in +++ b/Tests/CTestUpdateCVS.cmake.in @@ -6,6 +6,7 @@ get_filename_component(TOP "${CMAKE_CURRENT_LIST_FILE}" PATH) set(TOP "${TOP}/@CTestUpdateCVS_DIR@") set(UPDATE_NOT_GLOBAL 1) +set(UPDATE_MAYBE Updated{CTestConfig.cmake}) # Include code common to all update tests. include("@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake") diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake index d86bf0d..94c37fe 100644 --- a/Tests/CTestUpdateCommon.cmake +++ b/Tests/CTestUpdateCommon.cmake @@ -190,7 +190,7 @@ function(run_dashboard_command_line bin_dir) ) # Verify the updates reported by CTest. - set(UPDATE_MAYBE Updated{subdir}) + list(APPEND UPDATE_MAYBE Updated{subdir}) check_updates(${bin_dir} Updated{foo.txt} Updated{bar.txt} @@ -210,7 +210,7 @@ function(run_dashboard_script name) ) # Verify the updates reported by CTest. - set(UPDATE_MAYBE Updated{subdir}) + list(APPEND UPDATE_MAYBE Updated{subdir}) check_updates(dash-binary Updated{foo.txt} Updated{bar.txt} -- cgit v0.12