diff options
| author | Zack Galbreath <zack.galbreath@kitware.com> | 2019-04-30 20:09:54 (GMT) |
|---|---|---|
| committer | Zack Galbreath <zack.galbreath@kitware.com> | 2019-05-02 14:48:45 (GMT) |
| commit | a0d04d8810cb40daaaa7876453df81ff228beb82 (patch) | |
| tree | b8626414295e510381830ceca62ff53a048cf23a | |
| parent | ce79364581643700ab88ee4c442e0cf1736c926e (diff) | |
| download | CMake-a0d04d8810cb40daaaa7876453df81ff228beb82.zip CMake-a0d04d8810cb40daaaa7876453df81ff228beb82.tar.gz CMake-a0d04d8810cb40daaaa7876453df81ff228beb82.tar.bz2 | |
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).
| -rw-r--r-- | Tests/RunCMake/ctest_update/RunCMakeTest.cmake | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_update/UpdateChangeId-check.cmake | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Tests/RunCMake/ctest_update/RunCMakeTest.cmake b/Tests/RunCMake/ctest_update/RunCMakeTest.cmake index 0e1748f..f7a31e5 100644 --- a/Tests/RunCMake/ctest_update/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_update/RunCMakeTest.cmake @@ -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() diff --git a/Tests/RunCMake/ctest_update/UpdateChangeId-check.cmake b/Tests/RunCMake/ctest_update/UpdateChangeId-check.cmake index 9269fbc..382fbec 100644 --- a/Tests/RunCMake/ctest_update/UpdateChangeId-check.cmake +++ b/Tests/RunCMake/ctest_update/UpdateChangeId-check.cmake @@ -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="<>1"]]) + if(NOT update_xml MATCHES [[ChangeId><>1]]) string(REPLACE "\n" "\n " update_xml " ${update_xml}") set(RunCMake_TEST_FAILED "Update.xml does not have expected ChangeId:\n${update_xml}" |