Skip to content

Commit

Permalink
Rename to tribits_print_cdash_url(), change print msg (TriBITSPub#483)
Browse files Browse the repository at this point in the history
This is part of a refactoring to display more CDash URLs other than just build
URLs.
  • Loading branch information
bartlettroscoe committed Jun 7, 2022
1 parent 7e25fb2 commit b3074cc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions test/ctest_driver/TribitsExampleProject/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions tribits/ctest_driver/TribitsCTestDriverCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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***"
Expand Down Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,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( <msg> <cdashBuildUrl> )
# tribits_print_cdash_url( <msg> <cdashUrl> )
#
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()


Expand Down

0 comments on commit b3074cc

Please sign in to comment.