diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2015-07-03 20:52:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-06 18:04:35 (GMT) |
| commit | 140b18648030135fbfc8fb074317c77d93a4b584 (patch) | |
| tree | 1b7b102f6dcda16420e1c3fe5f332b1e02d491fb /Source/cmCTest.cxx | |
| parent | 7e86f567aca6b913689dc2d8c17a17936284b811 (diff) | |
| download | CMake-140b18648030135fbfc8fb074317c77d93a4b584.zip CMake-140b18648030135fbfc8fb074317c77d93a4b584.tar.gz CMake-140b18648030135fbfc8fb074317c77d93a4b584.tar.bz2 | |
CTest: hide progress ticks in verbose output
The progress ticks and information about the length of the output are
useful when the actual output is not visible. When the output is
printed, the progress ticks
* add no useful information,
* do not look pretty, and
* make the output hard to parse for tools.
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 5887ba8..5676dda 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1220,7 +1220,7 @@ int cmCTest::RunMakeCommand(const char* command, std::string& output, char* data; int length; - cmCTestLog(this, HANDLER_OUTPUT, + cmCTestLog(this, HANDLER_PROGRESS_OUTPUT, " Each . represents " << tick_len << " bytes of output" << std::endl << " " << std::flush); while(cmsysProcess_WaitForData(cp, &data, &length, 0)) @@ -1236,10 +1236,10 @@ int cmCTest::RunMakeCommand(const char* command, std::string& output, while ( output.size() > (tick * tick_len) ) { tick ++; - cmCTestLog(this, HANDLER_OUTPUT, "." << std::flush); + cmCTestLog(this, HANDLER_PROGRESS_OUTPUT, "." << std::flush); if ( tick % tick_line_len == 0 && tick > 0 ) { - cmCTestLog(this, HANDLER_OUTPUT, + cmCTestLog(this, HANDLER_PROGRESS_OUTPUT, " Size: " << int((double(output.size()) / 1024.0) + 1) << "K" << std::endl @@ -1252,7 +1252,7 @@ int cmCTest::RunMakeCommand(const char* command, std::string& output, ofs << cmCTestLogWrite(data, length); } } - cmCTestLog(this, OUTPUT, " Size of output: " + cmCTestLog(this, HANDLER_PROGRESS_OUTPUT, " Size of output: " << int(double(output.size()) / 1024.0) << "K" << std::endl); cmsysProcess_WaitForExit(cp, 0); @@ -3101,6 +3101,7 @@ static const char* cmCTestStringLogType[] = "DEBUG", "OUTPUT", "HANDLER_OUTPUT", + "HANDLER_PROGRESS_OUTPUT", "HANDLER_VERBOSE_OUTPUT", "WARNING", "ERROR_MESSAGE", @@ -3139,6 +3140,11 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg, { return; } + if ( logType == cmCTest::HANDLER_PROGRESS_OUTPUT && + ( this->Debug || this->ExtraVerbose ) ) + { + return; + } if ( this->OutputLogFile ) { bool display = true; |