From b6762366a1b6e8d07d5843f0fbe22c8fa2404d72 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 1 Jun 2022 10:55:13 -0600 Subject: [PATCH] Rename to tribits_print_cdash_url(), change print msg (#483) This is part of a refactoring to display more CDash URLs other than just build URLs. --- test/ctest_driver/TribitsExampleProject/CMakeLists.txt | 4 ++-- tribits/ctest_driver/TribitsCTestDriverCore.cmake | 6 ++++-- .../ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/ctest_driver/TribitsExampleProject/CMakeLists.txt b/test/ctest_driver/TribitsExampleProject/CMakeLists.txt index c2ec213ae..602b6e4a9 100644 --- a/test/ctest_driver/TribitsExampleProject/CMakeLists.txt +++ b/test/ctest_driver/TribitsExampleProject/CMakeLists.txt @@ -1299,9 +1299,9 @@ function(generate_aao_tests) "NONE does not exist, skipping extra repositories" "Final set of enabled packages: SimpleCxx 1" "Final set of enabled SE packages: SimpleCxx 1" - "Results will be submitted on CDash at:" + "Results will be submitted to CDash at:" "File '' does NOT exist so all tests passed" - "See results submitted on CDash at:" + "See results submitted to CDash at:" "${cdash_url_expected_regex}" "TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED" ALWAYS_FAIL_ON_NONZERO_RETURN diff --git a/tribits/ctest_driver/TribitsCTestDriverCore.cmake b/tribits/ctest_driver/TribitsCTestDriverCore.cmake index e02d292c4..253dea48a 100644 --- a/tribits/ctest_driver/TribitsCTestDriverCore.cmake +++ b/tribits/ctest_driver/TribitsCTestDriverCore.cmake @@ -2095,7 +2095,8 @@ function(tribits_ctest_driver) tribits_remember_if_configure_attempted() tribits_get_build_url_and_write_to_file(CDASH_BUILD_URL "${CTEST_BINARY_DIRECTORY}/CDashBuildUrl.txt") - tribits_print_build_url("Results will be submitted on CDash at:" "${CDASH_BUILD_URL}") + tribits_print_cdash_url("Results will be submitted to CDash at:" + "${CDASH_BUILD_URL}") message( "\n***" @@ -2369,7 +2370,8 @@ function(tribits_ctest_driver) report_queued_errors() - tribits_print_build_url("See results submitted on CDash at:" "${CDASH_BUILD_URL}") + tribits_print_cdash_url("See results submitted to CDash at:" + "${CDASH_BUILD_URL}") if ((NOT UPDATE_FAILED) AND ("${${PROJECT_NAME}_FAILED_PACKAGES}" STREQUAL "")) message( diff --git a/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake b/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake index 944a598d6..9fc812b63 100644 --- a/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake +++ b/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake @@ -53,17 +53,17 @@ function(tribits_get_build_url_and_write_to_file cdashBuildUrlOut cdashBuildUr endfunction() -# @FUNCTION: tribits_print_build_url() +# @FUNCTION: tribits_print_cdash_url() # # Print the URL on CDash where build results can be found. # # Usage:: # -# tribits_print_build_url( ) +# tribits_print_cdash_url( ) # -function(tribits_print_build_url msg cdashBuildUrl) +function(tribits_print_cdash_url msg cdashUrl) message("\n${msg}\n") - message(" ${cdashBuildUrl}\n") + message(" ${cdashUrl}\n") endfunction()