diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-22 15:32:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-26 13:43:46 (GMT) |
| commit | 303e81343804d5ef271a3669c1e6cac558055ca1 (patch) | |
| tree | 84f1be553d209509b1f095619d2e421199c83baa /Source/CTest | |
| parent | 51565abe7929f4baf5772345dc8d9c62ece9cf7a (diff) | |
| download | CMake-303e81343804d5ef271a3669c1e6cac558055ca1.zip CMake-303e81343804d5ef271a3669c1e6cac558055ca1.tar.gz CMake-303e81343804d5ef271a3669c1e6cac558055ca1.tar.bz2 | |
CTest: Simplify some boolean conditions
Directly compare two boolean values instead of spelling out accepted
combinations.
Issue: #19610
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 3 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index fb91322..d232c23 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -148,8 +148,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started) this->TestResult.CompletionStatus = s.str(); cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Skipped "); skipped = true; - } else if ((success && !this->TestProperties->WillFail) || - (!success && this->TestProperties->WillFail)) { + } else if (success != this->TestProperties->WillFail) { this->TestResult.Status = cmCTestTestHandler::COMPLETED; outputStream << " Passed "; } else { diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 7ae0d26..8430ef4 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -700,8 +700,7 @@ void cmCTestTestHandler::PrintLabelOrSubprojectSummary(bool doSubProject) } // if we are doing sub projects and this label is one, then use it // if we are not doing sub projects and the label is not one use it - if ((doSubProject && isSubprojectLabel) || - (!doSubProject && !isSubprojectLabel)) { + if (doSubProject == isSubprojectLabel) { if (l.size() > maxlen) { maxlen = l.size(); } |