diff options
author | Brad King <brad.king@kitware.com> | 2016-11-11 15:44:24 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-11 15:44:24 (GMT) |
commit | 8b33507aba37f7aa8dc1c0d961ba49ef10679449 (patch) | |
tree | 31eddd100d85ee127b53e4cf47c23c83578d0863 | |
parent | a0b159685ea4383255e46de5456d6a9204457c1f (diff) | |
parent | d3633731ab423b0627f86f94e6ff5fb932bbe76e (diff) | |
download | CMake-8b33507aba37f7aa8dc1c0d961ba49ef10679449.zip CMake-8b33507aba37f7aa8dc1c0d961ba49ef10679449.tar.gz CMake-8b33507aba37f7aa8dc1c0d961ba49ef10679449.tar.bz2 |
Merge topic 'cdash_version_check'
d3633731 Do not query CDash for version
f725b20b Update tests that expect uncompressed output
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 21 | ||||
-rw-r--r-- | Source/cmCTest.cxx | 48 | ||||
-rw-r--r-- | Source/cmCTest.h | 8 | ||||
-rw-r--r-- | Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 1 | ||||
-rw-r--r-- | Tests/RunCMake/RunCTest.cmake | 1 |
7 files changed, 6 insertions, 77 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index c18e20c..0f27fac 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -360,7 +360,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()) diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 010fc4e..f35a0b3 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -271,7 +271,6 @@ cmCTest::cmCTest() this->UseHTTP10 = false; this->PrintLabels = false; this->CompressTestOutput = true; - this->CompressMemCheckOutput = true; this->TestModel = cmCTest::EXPERIMENTAL; this->MaxTestNameWidth = 30; this->InteractiveDebugMode = true; @@ -289,8 +288,6 @@ cmCTest::cmCTest() this->DartVersion = 1; this->DropSiteCDash = false; this->OutputTestOutputOnTestFailure = false; - this->ComputedCompressTestOutput = false; - this->ComputedCompressMemCheckOutput = false; this->RepeatTests = 1; // default to run each test once this->RepeatUntilFail = false; std::string outOnFail; @@ -358,53 +355,9 @@ void cmCTest::SetTestLoad(unsigned long load) bool cmCTest::ShouldCompressTestOutput() { - if (!this->ComputedCompressTestOutput) { - std::string cdashVersion = this->GetCDashVersion(); - // version >= 1.6? - bool cdashSupportsGzip = cmSystemTools::VersionCompare( - cmSystemTools::OP_GREATER_EQUAL, cdashVersion.c_str(), "1.6"); - this->CompressTestOutput &= cdashSupportsGzip; - this->ComputedCompressTestOutput = true; - } return this->CompressTestOutput; } -bool cmCTest::ShouldCompressMemCheckOutput() -{ - if (!this->ComputedCompressMemCheckOutput) { - std::string cdashVersion = this->GetCDashVersion(); - - bool compressionSupported = cmSystemTools::VersionCompare( - cmSystemTools::OP_GREATER, cdashVersion.c_str(), "1.9.0"); - this->CompressMemCheckOutput &= compressionSupported; - this->ComputedCompressMemCheckOutput = true; - } - return this->CompressMemCheckOutput; -} - -std::string cmCTest::GetCDashVersion() -{ -#ifdef CMAKE_BUILD_WITH_CMAKE - // First query the server. If that fails, fall back to the local setting - std::string response; - std::string url = "http://"; - url += this->GetCTestConfiguration("DropSite"); - - std::string cdashUri = this->GetCTestConfiguration("DropLocation"); - cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php")); - - int res = 1; - if (!cdashUri.empty()) { - url += cdashUri + "/api/getversion.php"; - res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3); - } - - return res ? this->GetCTestConfiguration("CDashVersion") : response; -#else - return this->GetCTestConfiguration("CDashVersion"); -#endif -} - cmCTest::Part cmCTest::GetPartFromName(const char* name) { // Look up by lower-case to make names case-insensitive. @@ -1746,7 +1699,6 @@ bool cmCTest::HandleCommandLineArguments(size_t& i, if (this->CheckArgument(arg, "--no-compress-output")) { this->CompressTestOutput = false; - this->CompressMemCheckOutput = false; } if (this->CheckArgument(arg, "--print-labels")) { diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 8d3f8fb..e5b4728 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -232,11 +232,8 @@ public: bool ShouldPrintLabels() { return this->PrintLabels; } bool ShouldCompressTestOutput(); - bool ShouldCompressMemCheckOutput(); bool CompressString(std::string& str); - std::string GetCDashVersion(); - std::string GetStopTime() { return this->StopTime; } void SetStopTime(std::string const& time); @@ -487,10 +484,6 @@ private: bool RunConfigurationScript; - // flag for lazy getter (optimization) - bool ComputedCompressTestOutput; - bool ComputedCompressMemCheckOutput; - int GenerateNotesFile(const char* files); void DetermineNextDayStop(); @@ -547,7 +540,6 @@ private: bool CompressXMLFiles; bool CompressTestOutput; - bool CompressMemCheckOutput; void InitStreams(); std::ostream* StreamOut; diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 2bc3693..e936dab 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -135,6 +135,7 @@ function(run_TestOutputSize) ") run_cmake_command(TestOutputSize ${CMAKE_CTEST_COMMAND} -M Experimental -T Test + --no-compress-output --test-output-size-passed 10 --test-output-size-failed 12 ) diff --git a/Tests/RunCMake/RunCTest.cmake b/Tests/RunCMake/RunCTest.cmake index e94432b..89e16ee 100644 --- a/Tests/RunCMake/RunCTest.cmake +++ b/Tests/RunCMake/RunCTest.cmake @@ -12,6 +12,7 @@ function(run_ctest CASE_NAME) -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake -V --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log + --no-compress-output ${ARGN} ) endfunction() |