kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2010-02-10 11:48:09 -05:00
parent 10750bff1c
commit 2de33ebd58
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/CTestUpdateCVS.cmake.in
View File

@ -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")

4
Tests/CTestUpdateCommon.cmake
View File

@ -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}