ctest_submit: Add parameter SUBMIT_URL

This commit is contained in:
Regina Pfeifer
2018-11-28 22:31:25 +01:00
committed by Brad King
parent 65e725c957
commit 938f06fda6
2 changed files with 16 additions and 1 deletions

View File

@@ -15,7 +15,9 @@ class cmExecutionStatus;
cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
{
const char* submitURL = this->Makefile->GetDefinition("CTEST_SUBMIT_URL");
const char* submitURL = !this->SubmitURL.empty()
? this->SubmitURL.c_str()
: this->Makefile->GetDefinition("CTEST_SUBMIT_URL");
if (submitURL) {
this->CTest->SetCTestConfiguration("SubmitURL", submitURL, this->Quiet);
@@ -174,6 +176,11 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
return true;
}
if (arg == "SUBMIT_URL") {
this->ArgumentDoing = ArgumentDoingSubmitURL;
return true;
}
if (arg == "INTERNAL_TEST_CHECKSUM") {
this->InternalTest = true;
return true;
@@ -239,6 +246,12 @@ bool cmCTestSubmitCommand::CheckArgumentValue(std::string const& arg)
return true;
}
if (this->ArgumentDoing == ArgumentDoingSubmitURL) {
this->ArgumentDoing = ArgumentDoingNone;
this->SubmitURL = arg;
return true;
}
// Look for other arguments.
return this->Superclass::CheckArgumentValue(arg);
}

View File

@@ -71,6 +71,7 @@ protected:
ArgumentDoingCDashUpload,
ArgumentDoingCDashUploadType,
ArgumentDoingHttpHeader,
ArgumentDoingSubmitURL,
ArgumentDoingLast2
};
@@ -85,6 +86,7 @@ protected:
std::string CDashUploadFile;
std::string CDashUploadType;
std::vector<std::string> HttpHeaders;
std::string SubmitURL;
};
#endif