From c43153c7bb15c9781c6397c8cf7daf8f68e898eb Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 9 Aug 2022 12:36:53 -0600 Subject: [PATCH] Change to post to my.cdash.org (#508) I just created that project. I had to change one test that inadvertently pics up this changes when it should not. There is another test that checks the full URL. --- CTestConfig.cmake | 6 +++--- test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index b797c2606..283cd1215 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -15,10 +15,10 @@ if (NOT DEFINED CTEST_DROP_METHOD) endif() if (CTEST_DROP_METHOD STREQUAL "http" OR CTEST_DROP_METHOD STREQUAL "https") - set_default_and_from_env(CTEST_DROP_SITE "testing.sandia.gov") - set_default_and_from_env(TRIBITS_2ND_CTEST_DROP_SITE "testing-dev.sandia.gov") + set_default_and_from_env(CTEST_DROP_SITE "my.cdash.org") + #set_default_and_from_env(TRIBITS_2ND_CTEST_DROP_SITE "testing-dev.sandia.gov") set_default_and_from_env(CTEST_PROJECT_NAME "TriBITS") - set_default_and_from_env(CTEST_DROP_LOCATION "/cdash/submit.php?project=TriBITS") + set_default_and_from_env(CTEST_DROP_LOCATION "/submit.php?project=TriBITS") set_default_and_from_env(CTEST_TRIGGER_SITE "") set_default_and_from_env(CTEST_DROP_SITE_CDASH TRUE) endif() diff --git a/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt b/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt index 541321c97..9303b3f1c 100644 --- a/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt +++ b/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt @@ -99,16 +99,16 @@ set(TribitsExampleMetaProject_COMMON_CONFIG_ARGS set(cdash_build_url_expected_regex - "https://testing[.]sandia[.]gov/cdash/index[.]php[?]project=TribitsExampleMetaProject&filtercount=3&showfilters=1&filtercombine=and&field1=site&compare1=61&value1=CustomSite&field2=buildname&compare2=61&value2=CTestDriver_TribitsExMetaProj_clone_default_branch_remote&field3=buildstamp&compare3=61&value3=[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-Continuous" ) + "/index[.]php[?]project=TribitsExampleMetaProject&filtercount=3&showfilters=1&filtercombine=and&field1=site&compare1=61&value1=CustomSite&field2=buildname&compare2=61&value2=CTestDriver_TribitsExMetaProj_clone_default_branch_remote&field3=buildstamp&compare3=61&value3=[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-Continuous" ) # NOTE: Above, we have to repeat [0-9] 8 times and 4 times for the regex for # the number of digits in the buildstarttime. CMake regex does not support # \d{8}-\d{4} :-( set(cdash_revisions_builds_url_expected_regex - "https://testing[.]sandia[.]gov/cdash/index.php[?]project=TribitsExampleMetaProject&filtercount=1&showfilters=1&field1=revision&compare1=61&value1=863461e3035d24c632e175c087761e83db28bdc3") + "/index.php[?]project=TribitsExampleMetaProject&filtercount=1&showfilters=1&field1=revision&compare1=61&value1=863461e3035d24c632e175c087761e83db28bdc3") set(cdash_revisions_nonpassing_tests_expected_regex - "https://testing[.]sandia[.]gov/cdash/queryTests.php[?]project=TribitsExampleMetaProject&filtercount=2&showfilters=1&filtercombine=and&field1=revision&compare1=61&value1=863461e3035d24c632e175c087761e83db28bdc3&field2=status&compare2=62&value2=passed" ) + "/queryTests.php[?]project=TribitsExampleMetaProject&filtercount=2&showfilters=1&filtercombine=and&field1=revision&compare1=61&value1=863461e3035d24c632e175c087761e83db28bdc3&field2=status&compare2=62&value2=passed" ) tribits_add_advanced_test( CTestDriver_TribitsExMetaProj_clone_default_branch_remote