testing: Update terminology in ctest_update tests

Use the word "Update" instead of "Test" in ctest_update's RunCMake tests.

This change was prompted because I noticed that UpdateChangeId-check.cmake
was not actually getting called during the relevant test case.  This file
also had to be updated since its purpose is to detect an expected XML element
(not an attribute).
This commit is contained in:
Zack Galbreath
2019-04-30 16:09:54 -04:00
parent ce79364581
commit a0d04d8810
2 changed files with 5 additions and 5 deletions

View File

@@ -5,13 +5,13 @@ function(run_ctest_update CASE_NAME)
run_ctest(${CASE_NAME})
endfunction()
run_ctest_update(TestQuiet QUIET)
run_ctest_update(UpdateQuiet QUIET)
function(run_TestChangeId)
function(run_UpdateChangeId)
set(CASE_TEST_PREFIX_CODE [[
set(CTEST_CHANGE_ID "<>1")
]])
run_ctest(TestChangeId)
run_ctest(UpdateChangeId)
endfunction()
run_TestChangeId()
run_UpdateChangeId()

View File

@@ -1,7 +1,7 @@
file(GLOB update_xml_file "${RunCMake_TEST_BINARY_DIR}/Testing/*/Update.xml")
if(update_xml_file)
file(READ "${update_xml_file}" update_xml LIMIT 4096)
if(NOT update_xml MATCHES [[ChangeId="&lt;&gt;1"]])
if(NOT update_xml MATCHES [[ChangeId>&lt;&gt;1]])
string(REPLACE "\n" "\n " update_xml " ${update_xml}")
set(RunCMake_TEST_FAILED
"Update.xml does not have expected ChangeId:\n${update_xml}"