summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/CTest/cmCTestMemCheckHandler.cxx2
-rw-r--r--Source/CTest/cmCTestRunTest.cxx2
-rw-r--r--Source/CTest/cmCTestSubmitHandler.cxx21
-rw-r--r--Source/cmCTest.cxx48
-rw-r--r--Source/cmCTest.h8
5 files changed, 4 insertions, 77 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())
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;
generated by cgit v0.12 at 2024-11-08 06:09:58 (GMT)