diff options
author | Zack Galbreath <zack.galbreath@kitware.com> | 2016-11-08 20:36:29 (GMT) |
---|---|---|
committer | Zack Galbreath <zack.galbreath@kitware.com> | 2016-11-08 20:58:50 (GMT) |
commit | d3633731ab423b0627f86f94e6ff5fb932bbe76e (patch) | |
tree | fd6174ade802dc7fcb0271e8dc1bad42ada5cc18 /Source/CTest | |
parent | f725b20be36482f46364f17d18e528b5738d0e6a (diff) | |
download | CMake-d3633731ab423b0627f86f94e6ff5fb932bbe76e.zip CMake-d3633731ab423b0627f86f94e6ff5fb932bbe76e.tar.gz CMake-d3633731ab423b0627f86f94e6ff5fb932bbe76e.tar.bz2 |
Do not query CDash for version
This check was not functioning properly for the following reasons:
* The "DropSite" and "DropLocation" CTest Configurations do not
get set until ctest_submit() is called. So if ctest_submit()
was not called before ctest_test() we would end up with uncompressed
output, even if the CDash server was new enough to support this feature.
* CDash's API is now versioned. The current location to query is
now /api/v1/getversion.php, not /api/getversion.php.
As a result of these issues, CTest would not compress test/memcheck
output when it should. Rather than fix this check, we now assume that
CTest is communicating with a new enough version of CDash. This behavior
can be controlled through the use of the --no-compress-output command-line
argument.
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 21 |
3 files changed, 4 insertions, 21 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 0052a16..1210d8a 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -354,7 +354,7 @@ void cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml) xml.EndElement(); // Results xml.StartElement("Log"); - if (this->CTest->ShouldCompressMemCheckOutput()) { + if (this->CTest->ShouldCompressTestOutput()) { this->CTest->CompressString(memcheckstr); xml.Attribute("compression", "gzip"); xml.Attribute("encoding", "base64"); diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index b30f6eb..fbc94cc 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -153,7 +153,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started) if ((!this->TestHandler->MemCheck && this->CTest->ShouldCompressTestOutput()) || (this->TestHandler->MemCheck && - this->CTest->ShouldCompressMemCheckOutput())) { + this->CTest->ShouldCompressTestOutput())) { this->CompressOutput(); } diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index d10f7ad..8383132 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -46,7 +46,6 @@ public: }; StatusType Status; - std::string CDashVersion; std::string Filename; std::string MD5; std::string Message; @@ -63,12 +62,10 @@ private: return val; } - void StartElement(const std::string& name, const char** atts) CM_OVERRIDE + void StartElement(const std::string& /*name*/, + const char** /*atts*/) CM_OVERRIDE { this->CurrentValue.clear(); - if (name == "cdash") { - this->CDashVersion = this->FindAttribute(atts, "version"); - } } void CharacterDataHandler(const char* data, int length) CM_OVERRIDE @@ -470,20 +467,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, // Now run off and do what you've been told! res = ::curl_easy_perform(curl); - if (cmSystemTools::IsOn(this->GetOption("InternalTest")) && - cmSystemTools::VersionCompare(cmSystemTools::OP_LESS, - this->CTest->GetCDashVersion().c_str(), - "1.7")) { - // mock failure output for internal test case - std::string mock_output = - "<cdash version=\"1.7.0\">\n" - " <status>ERROR</status>\n" - " <message>Checksum failed for file.</message>\n" - "</cdash>\n"; - chunk.clear(); - chunk.assign(mock_output.begin(), mock_output.end()); - } - if (!chunk.empty()) { cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: [" << cmCTestLogWrite(&*chunk.begin(), chunk.size()) |