|
@@ -496,11 +496,11 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
|
|
? ""
|
|
? ""
|
|
: this->GetOption("RetryCount");
|
|
: this->GetOption("RetryCount");
|
|
|
|
|
|
- int delay = retryDelay == ""
|
|
|
|
|
|
+ int delay = retryDelay.empty()
|
|
? atoi(this->CTest->GetCTestConfiguration("CTestSubmitRetryDelay")
|
|
? atoi(this->CTest->GetCTestConfiguration("CTestSubmitRetryDelay")
|
|
.c_str())
|
|
.c_str())
|
|
: atoi(retryDelay.c_str());
|
|
: atoi(retryDelay.c_str());
|
|
- int count = retryCount == ""
|
|
|
|
|
|
+ int count = retryCount.empty()
|
|
? atoi(this->CTest->GetCTestConfiguration("CTestSubmitRetryCount")
|
|
? atoi(this->CTest->GetCTestConfiguration("CTestSubmitRetryCount")
|
|
.c_str())
|
|
.c_str())
|
|
: atoi(retryCount.c_str());
|
|
: atoi(retryCount.c_str());
|
|
@@ -1032,14 +1032,14 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
|
|
? ""
|
|
? ""
|
|
: this->GetOption("RetryCount");
|
|
: this->GetOption("RetryCount");
|
|
unsigned long retryDelay = 0;
|
|
unsigned long retryDelay = 0;
|
|
- if (retryDelayString != "") {
|
|
|
|
|
|
+ if (!retryDelayString.empty()) {
|
|
if (!cmSystemTools::StringToULong(retryDelayString.c_str(), &retryDelay)) {
|
|
if (!cmSystemTools::StringToULong(retryDelayString.c_str(), &retryDelay)) {
|
|
cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
|
|
cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
|
|
<< retryDelayString << std::endl);
|
|
<< retryDelayString << std::endl);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
unsigned long retryCount = 0;
|
|
unsigned long retryCount = 0;
|
|
- if (retryCountString != "") {
|
|
|
|
|
|
+ if (!retryCountString.empty()) {
|
|
if (!cmSystemTools::StringToULong(retryCountString.c_str(), &retryCount)) {
|
|
if (!cmSystemTools::StringToULong(retryCountString.c_str(), &retryCount)) {
|
|
cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
|
|
cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
|
|
<< retryCountString << std::endl);
|
|
<< retryCountString << std::endl);
|
|
@@ -1361,7 +1361,7 @@ int cmCTestSubmitHandler::ProcessHandler()
|
|
|
|
|
|
std::string dropMethod(this->CTest->GetCTestConfiguration("DropMethod"));
|
|
std::string dropMethod(this->CTest->GetCTestConfiguration("DropMethod"));
|
|
|
|
|
|
- if (dropMethod == "" || dropMethod == "ftp") {
|
|
|
|
|
|
+ if (dropMethod.empty() || dropMethod == "ftp") {
|
|
ofs << "Using drop method: FTP" << std::endl;
|
|
ofs << "Using drop method: FTP" << std::endl;
|
|
cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
|
|
cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
|
|
" Using FTP submit method" << std::endl
|
|
" Using FTP submit method" << std::endl
|