diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-26 14:37:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-26 14:47:24 (GMT) |
| commit | 8685d0d2911f01fb7e2d26a2fd904dbf73712ce4 (patch) | |
| tree | 3b0f49d7be716d1f81b673971965ac31ad0ea43a /Source/CTest/cmCTestSubmitHandler.cxx | |
| parent | 7290cea75bd0fe45e0862c6c3976caa3627be939 (diff) | |
| parent | aaf59120bfd77a960317923da30e1a70ce0d8aae (diff) | |
| download | CMake-8685d0d2911f01fb7e2d26a2fd904dbf73712ce4.zip CMake-8685d0d2911f01fb7e2d26a2fd904dbf73712ce4.tar.gz CMake-8685d0d2911f01fb7e2d26a2fd904dbf73712ce4.tar.bz2 | |
Merge topic 'source_sweep_cmExpandedList'
aaf59120bf Source sweep: Replace cmExpandList with the shorter cmExpandedList
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3725
Diffstat (limited to 'Source/CTest/cmCTestSubmitHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 4ebb1c8..a178b44 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -155,8 +155,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( /* In windows, this will init the winsock stuff */ ::curl_global_init(CURL_GLOBAL_ALL); std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions")); - std::vector<std::string> args; - cmExpandList(curlopt, args); + std::vector<std::string> args = cmExpandedList(curlopt); bool verifyPeerOff = false; bool verifyHostOff = false; for (std::string const& arg : args) { @@ -499,8 +498,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file, cmCTestCurl curl(this->CTest); curl.SetQuiet(this->Quiet); std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions")); - std::vector<std::string> args; - cmExpandList(curlopt, args); + std::vector<std::string> args = cmExpandedList(curlopt); curl.SetCurlOptions(args); curl.SetTimeOutSeconds(SUBMIT_TIMEOUT_IN_SECONDS_DEFAULT); curl.SetHttpHeaders(this->HttpHeaders); |