diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-05 13:40:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-05 13:41:53 (GMT) |
| commit | 5875140c57bc3160970d640070ae1e9ab19111db (patch) | |
| tree | 7faadda036ca2c663bcd750ce60b546ac8304bb2 | |
| parent | 1fa165359fd7ed3989b1a8350726038a55deab5c (diff) | |
| parent | f59d729c7cb03babafac0cee792b9a3127e51d4d (diff) | |
| download | CMake-5875140c57bc3160970d640070ae1e9ab19111db.zip CMake-5875140c57bc3160970d640070ae1e9ab19111db.tar.gz CMake-5875140c57bc3160970d640070ae1e9ab19111db.tar.bz2 | |
Merge topic 'display-ctest-disabled'
f59d729c ctest: Display disabled status when ctest -N is called
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !923
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index fdc16b1..2c16a0d 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -720,9 +720,13 @@ void cmCTestMultiProcessHandler::PrintTestList() std::setw(3 + getNumWidth(this->TestHandler->GetMaxIndex())) << indexStr.str(), this->Quiet); - cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " ", this->Quiet); - cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, p.Name << std::endl, + cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " " << p.Name, this->Quiet); + if (p.Disabled) { + cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " (Disabled)", + this->Quiet); + } + cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl, this->Quiet); } cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl |