diff options
author | Brad King <brad.king@kitware.com> | 2018-09-19 14:36:05 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-19 14:36:11 (GMT) |
commit | c0cedaa6435d2eb1a49afab1eaa08ba3cd40290e (patch) | |
tree | 201a337c61739db6043fd856c6b961e8f91ec91c /Source/CTest | |
parent | 76a19eb6c16272e4600267aed6ed7aff0fd9c765 (diff) | |
parent | 7f530cc54e070257ea0a59ea4f63ab6f34bcf878 (diff) | |
download | CMake-c0cedaa6435d2eb1a49afab1eaa08ba3cd40290e.zip CMake-c0cedaa6435d2eb1a49afab1eaa08ba3cd40290e.tar.gz CMake-c0cedaa6435d2eb1a49afab1eaa08ba3cd40290e.tar.bz2 |
Merge topic 'ctest-more_submit_params'
7f530cc54e ctest_submit: pass additional info to CDash
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2380
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index cbed40e..c7f3f39 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -425,6 +425,29 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, ((url.find('?') == std::string::npos) ? '?' : '&') + "FileName=" + ofile; + cmCTestCurl ctest_curl(this->CTest); + upload_as += "&build="; + upload_as += + ctest_curl.Escape(this->CTest->GetCTestConfiguration("BuildName")); + upload_as += "&site="; + upload_as += + ctest_curl.Escape(this->CTest->GetCTestConfiguration("Site")); + upload_as += "&stamp="; + upload_as += ctest_curl.Escape(this->CTest->GetCurrentTag()); + upload_as += "-"; + upload_as += ctest_curl.Escape(this->CTest->GetTestModelString()); + cmCTestScriptHandler* ch = + static_cast<cmCTestScriptHandler*>(this->CTest->GetHandler("script")); + cmake* cm = ch->GetCMake(); + if (cm) { + const char* subproject = + cm->GetState()->GetGlobalProperty("SubProject"); + if (subproject) { + upload_as += "&subproject="; + upload_as += ctest_curl.Escape(subproject); + } + } + upload_as += "&MD5="; if (cmSystemTools::IsOn(this->GetOption("InternalTest"))) { |