[Cmake-commits] CMake branch, next, updated. v3.7.2-2237-g956e20e
Brad King
brad.king at kitware.com
Fri Jan 20 11:44:45 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 956e20ea5b043a207449000020dd0dda62c3bd64 (commit)
via e78ff350cf2228579077211aab5ed994183235a3 (commit)
from d3742568c8597a7e5050e1607ed4e6f91f29bd09 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=956e20ea5b043a207449000020dd0dda62c3bd64
commit 956e20ea5b043a207449000020dd0dda62c3bd64
Merge: d374256 e78ff35
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:44:38 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:44:38 2017 -0500
Merge topic 'cdash_upload_retry' into next
e78ff350 Revert topic 'cdash_upload_retry'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78ff350cf2228579077211aab5ed994183235a3
commit e78ff350cf2228579077211aab5ed994183235a3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:44:20 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:44:20 2017 -0500
Revert topic 'cdash_upload_retry'
diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index a7d9708..6830b59 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -56,16 +56,10 @@ Submit to CDash Upload API
::
- ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>]
- [RETRY_COUNT <count>]
- [RETRY_DELAY <delay>]
- [QUIET])
+ ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>])
This second signature is used to upload files to CDash via the CDash
file upload API. The api first sends a request to upload to CDash along
with a content hash of the file. If CDash does not already have the file,
then it is uploaded. Along with the file, a CDash type string is specified
to tell CDash which handler to use to process the data.
-
-This signature accepts the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET``
-options as described above.
diff --git a/Help/release/dev/cdash_upload_retry.rst b/Help/release/dev/cdash_upload_retry.rst
deleted file mode 100644
index 2ceb42b..0000000
--- a/Help/release/dev/cdash_upload_retry.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-cdash-upload-retry
------------------------
-
-* The ``CDASH_UPLOAD`` signature of :command:`ctest_submit` was taught to honor
- the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET`` options.
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index ab1412d..9a90f54 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -19,7 +19,6 @@ cmCTestCurl::cmCTestCurl(cmCTest* ctest)
// default is to verify https
this->VerifyPeerOff = false;
this->VerifyHostOff = false;
- this->Quiet = false;
this->TimeOutSeconds = 0;
this->Curl = curl_easy_init();
}
@@ -97,13 +96,6 @@ bool cmCTestCurl::InitCurl()
}
// enable HTTP ERROR parsing
curl_easy_setopt(this->Curl, CURLOPT_FAILONERROR, 1);
-
- // if there is little to no activity for too long stop submitting
- if (this->TimeOutSeconds) {
- curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
- curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME, this->TimeOutSeconds);
- }
-
return true;
}
@@ -118,7 +110,12 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
}
/* enable uploading */
curl_easy_setopt(this->Curl, CURLOPT_UPLOAD, 1);
-
+ // if there is little to no activity for too long stop submitting
+ if (this->TimeOutSeconds) {
+ ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
+ ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME,
+ this->TimeOutSeconds);
+ }
/* HTTP PUT please */
::curl_easy_setopt(this->Curl, CURLOPT_PUT, 1);
::curl_easy_setopt(this->Curl, CURLOPT_VERBOSE, 1);
@@ -160,14 +157,13 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
if (!responseData.empty()) {
response = std::string(responseData.begin(), responseData.end());
- cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- "Curl response: [" << response << "]\n", this->Quiet);
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Curl response: ["
+ << response << "]\n");
}
std::string curlDebug;
if (!debugData.empty()) {
curlDebug = std::string(debugData.begin(), debugData.end());
- cmCTestOptionalLog(this->CTest, DEBUG,
- "Curl debug: [" << curlDebug << "]\n", this->Quiet);
+ cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
}
if (response.empty()) {
cmCTestLog(this->CTest, ERROR_MESSAGE, "No response from server.\n"
@@ -181,10 +177,9 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
std::string const& fields, std::string& response)
{
response = "";
- cmCTestOptionalLog(this->CTest, DEBUG, "HttpRequest\n"
- << "url: " << url << "\n"
- << "fields " << fields << "\n",
- this->Quiet);
+ cmCTestLog(this->CTest, DEBUG, "HttpRequest\n"
+ << "url: " << url << "\n"
+ << "fields " << fields << "\n");
if (!this->InitCurl()) {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Initialization of curl failed");
return false;
@@ -207,16 +202,13 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
if (!responseData.empty()) {
response = std::string(responseData.begin(), responseData.end());
- cmCTestOptionalLog(this->CTest, DEBUG,
- "Curl response: [" << response << "]\n", this->Quiet);
+ cmCTestLog(this->CTest, DEBUG, "Curl response: [" << response << "]\n");
}
if (!debugData.empty()) {
std::string curlDebug = std::string(debugData.begin(), debugData.end());
- cmCTestOptionalLog(this->CTest, DEBUG,
- "Curl debug: [" << curlDebug << "]\n", this->Quiet);
+ cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
}
- cmCTestOptionalLog(this->CTest, DEBUG, "Curl res: " << res << "\n",
- this->Quiet);
+ cmCTestLog(this->CTest, DEBUG, "Curl res: " << res << "\n");
return (res == 0);
}
diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
index cdce393..17fbcff 100644
--- a/Source/CTest/cmCTestCurl.h
+++ b/Source/CTest/cmCTestCurl.h
@@ -25,7 +25,6 @@ public:
void SetCurlOptions(std::vector<std::string> const& args);
void SetUseHttp10On() { this->UseHttp10 = true; }
void SetTimeOutSeconds(int s) { this->TimeOutSeconds = s; }
- void SetQuiet(bool b) { this->Quiet = b; }
std::string Escape(std::string const& source);
protected:
@@ -41,7 +40,6 @@ private:
bool VerifyHostOff;
bool VerifyPeerOff;
bool UseHttp10;
- bool Quiet;
int TimeOutSeconds;
};
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 5cf4ddc..14b875f 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -157,7 +157,6 @@ bool cmCTestSubmitCommand::InitialPass(std::vector<std::string> const& args,
bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
{
if (this->CDashUpload) {
- // Arguments specific to the CDASH_UPLOAD signature.
if (arg == "CDASH_UPLOAD") {
this->ArgumentDoing = ArgumentDoingCDashUpload;
return true;
@@ -168,7 +167,7 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
return true;
}
} else {
- // Arguments that cannot be used with CDASH_UPLOAD.
+ // Look for arguments specific to this command.
if (arg == "PARTS") {
this->ArgumentDoing = ArgumentDoingParts;
this->PartsMentioned = true;
@@ -180,21 +179,21 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
this->FilesMentioned = true;
return true;
}
- }
- // Arguments used by both modes.
- if (arg == "RETRY_COUNT") {
- this->ArgumentDoing = ArgumentDoingRetryCount;
- return true;
- }
- if (arg == "RETRY_DELAY") {
- this->ArgumentDoing = ArgumentDoingRetryDelay;
- return true;
- }
+ if (arg == "RETRY_COUNT") {
+ this->ArgumentDoing = ArgumentDoingRetryCount;
+ return true;
+ }
- if (arg == "INTERNAL_TEST_CHECKSUM") {
- this->InternalTest = true;
- return true;
+ if (arg == "RETRY_DELAY") {
+ this->ArgumentDoing = ArgumentDoingRetryDelay;
+ return true;
+ }
+
+ if (arg == "INTERNAL_TEST_CHECKSUM") {
+ this->InternalTest = true;
+ return true;
+ }
}
// Look for other arguments.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 5e5119d..79c3663 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1007,7 +1007,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
return -1;
}
cmCTestCurl curl(this->CTest);
- curl.SetQuiet(this->Quiet);
std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions"));
std::vector<std::string> args;
cmSystemTools::ExpandListArgument(curlopt, args);
@@ -1023,30 +1022,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
"Only http and https are supported for CDASH_UPLOAD\n");
return -1;
}
- bool internalTest = cmSystemTools::IsOn(this->GetOption("InternalTest"));
-
- // Get RETRY_COUNT and RETRY_DELAY values if they were set.
- std::string retryDelayString = this->GetOption("RetryDelay") == CM_NULLPTR
- ? ""
- : this->GetOption("RetryDelay");
- std::string retryCountString = this->GetOption("RetryCount") == CM_NULLPTR
- ? ""
- : this->GetOption("RetryCount");
- unsigned long retryDelay = 0;
- if (retryDelayString != "") {
- if (!cmSystemTools::StringToULong(retryDelayString.c_str(), &retryDelay)) {
- cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
- << retryDelayString << std::endl);
- }
- }
- unsigned long retryCount = 0;
- if (retryCountString != "") {
- if (!cmSystemTools::StringToULong(retryCountString.c_str(), &retryCount)) {
- cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
- << retryCountString << std::endl);
- }
- }
-
char md5sum[33];
md5sum[32] = 0;
cmSystemTools::ComputeFileMD5(file, md5sum);
@@ -1083,33 +1058,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
<< "\nfile: " << file << "\n",
this->Quiet);
std::string response;
-
- bool requestSucceeded = curl.HttpRequest(url, fields, response);
- if (!internalTest && !requestSucceeded) {
- // If request failed, wait and retry.
- for (unsigned long i = 0; i < retryCount; i++) {
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
- " Request failed, waiting " << retryDelay
- << " seconds...\n",
- this->Quiet);
-
- double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
- while (cmSystemTools::GetTime() < stop) {
- cmSystemTools::Delay(100);
- }
-
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
- " Retry request: Attempt "
- << (i + 1) << " of " << retryCount << std::endl,
- this->Quiet);
-
- requestSucceeded = curl.HttpRequest(url, fields, response);
- if (requestSucceeded) {
- break;
- }
- }
- }
- if (!internalTest && !requestSucceeded) {
+ if (!curl.HttpRequest(url, fields, response)) {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in HttpRequest\n"
<< response);
return -1;
@@ -1119,32 +1068,30 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
this->Quiet);
Json::Value json;
Json::Reader reader;
- if (!internalTest && !reader.parse(response, json)) {
+ if (!reader.parse(response, json)) {
cmCTestLog(this->CTest, ERROR_MESSAGE, "error parsing json string ["
<< response << "]\n"
<< reader.getFormattedErrorMessages() << "\n");
return -1;
}
- if (!internalTest && json["status"].asInt() != 0) {
+ if (json["status"].asInt() != 0) {
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Bad status returned from CDash: " << json["status"].asInt());
return -1;
}
- if (!internalTest) {
- if (json["datafilesmd5"].isArray()) {
- int datares = json["datafilesmd5"][0].asInt();
- if (datares == 1) {
- cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- "File already exists on CDash, skip upload "
- << file << "\n",
- this->Quiet);
- return 0;
- }
- } else {
- cmCTestLog(this->CTest, ERROR_MESSAGE,
- "bad datafilesmd5 value in response " << response << "\n");
- return -1;
+ if (json["datafilesmd5"].isArray()) {
+ int datares = json["datafilesmd5"][0].asInt();
+ if (datares == 1) {
+ cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ "File already exists on CDash, skip upload " << file
+ << "\n",
+ this->Quiet);
+ return 0;
}
+ } else {
+ cmCTestLog(this->CTest, ERROR_MESSAGE,
+ "bad datafilesmd5 value in response " << response << "\n");
+ return -1;
}
std::string upload_as = cmSystemTools::GetFilenameName(file);
@@ -1153,40 +1100,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
<< "md5=" << md5sum << "&"
<< "filename=" << curl.Escape(upload_as) << "&"
<< "buildid=" << json["buildid"].asString();
-
- bool uploadSucceeded = false;
- if (!internalTest) {
- uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
- }
-
- if (!uploadSucceeded) {
- // If upload failed, wait and retry.
- for (unsigned long i = 0; i < retryCount; i++) {
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
- " Upload failed, waiting " << retryDelay
- << " seconds...\n",
- this->Quiet);
-
- double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
- while (cmSystemTools::GetTime() < stop) {
- cmSystemTools::Delay(100);
- }
-
- cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
- " Retry upload: Attempt "
- << (i + 1) << " of " << retryCount << std::endl,
- this->Quiet);
-
- if (!internalTest) {
- uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
- }
- if (uploadSucceeded) {
- break;
- }
- }
- }
-
- if (!uploadSucceeded) {
+ if (!curl.UploadFile(file, url, fstr.str(), response)) {
cmCTestLog(this->CTest, ERROR_MESSAGE, "error uploading to CDash. "
<< file << " " << url << " " << fstr.str());
return -1;
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
deleted file mode 100644
index 364ecde..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Upload file not found: 'bad-upload'
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
new file mode 100644
index 0000000..21621d4
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\):
+ ctest_submit called with unknown argument "RETRY_COUNT".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
new file mode 100644
index 0000000..f726674
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\):
+ ctest_submit called with unknown argument "RETRY_DELAY".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
deleted file mode 100644
index 6780c17..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-error uploading to CDash.
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
deleted file mode 100644
index a5459ac..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
+++ /dev/null
@@ -1,4 +0,0 @@
- Upload failed, waiting 1 seconds...
- Retry upload: Attempt 1 of 2
- Upload failed, waiting 1 seconds...
- Retry upload: Attempt 2 of 2
diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
index e104f8a..a81bc96 100644
--- a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
@@ -21,9 +21,9 @@ run_ctest_submit(PARTSCDashUpload PARTS Configure CDASH_UPLOAD)
run_ctest_submit(PARTSCDashUploadType PARTS Configure CDASH_UPLOAD_TYPE)
run_ctest_submit(CDashUploadPARTS CDASH_UPLOAD bad-upload PARTS)
run_ctest_submit(CDashUploadFILES CDASH_UPLOAD bad-upload FILES)
+run_ctest_submit(CDashUploadRETRY_COUNT CDASH_UPLOAD bad-upload RETRY_COUNT)
+run_ctest_submit(CDashUploadRETRY_DELAY CDASH_UPLOAD bad-upload RETRY_DELAY)
run_ctest_submit(CDashUploadNone CDASH_UPLOAD)
-run_ctest_submit(CDashUploadMissingFile CDASH_UPLOAD bad-upload)
-run_ctest_submit(CDashUploadRetry CDASH_UPLOAD ${CMAKE_CURRENT_LIST_FILE} CDASH_UPLOAD_TYPE foo RETRY_COUNT 2 RETRY_DELAY 1 INTERNAL_TEST_CHECKSUM)
run_ctest_submit(CDashSubmitQuiet QUIET)
function(run_ctest_CDashUploadFTP)
-----------------------------------------------------------------------
Summary of changes:
Help/command/ctest_submit.rst | 8 +-
Help/release/dev/cdash_upload_retry.rst | 5 -
Source/CTest/cmCTestCurl.cxx | 38 +++----
Source/CTest/cmCTestCurl.h | 2 -
Source/CTest/cmCTestSubmitCommand.cxx | 29 +++--
Source/CTest/cmCTestSubmitHandler.cxx | 118 +++-----------------
.../ctest_submit/CDashUploadMissingFile-stderr.txt | 1 -
...esult.txt => CDashUploadRETRY_COUNT-result.txt} | 0
.../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt | 2 +
...esult.txt => CDashUploadRETRY_DELAY-result.txt} | 0
.../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt | 2 +
.../ctest_submit/CDashUploadRetry-stderr.txt | 1 -
.../ctest_submit/CDashUploadRetry-stdout.txt | 4 -
Tests/RunCMake/ctest_submit/RunCMakeTest.cmake | 4 +-
14 files changed, 52 insertions(+), 162 deletions(-)
delete mode 100644 Help/release/dev/cdash_upload_retry.rst
delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
rename Tests/RunCMake/ctest_submit/{CDashUploadMissingFile-result.txt => CDashUploadRETRY_COUNT-result.txt} (100%)
create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
rename Tests/RunCMake/ctest_submit/{CDashUploadRetry-result.txt => CDashUploadRETRY_DELAY-result.txt} (100%)
create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list