Jelajahi Sumber

CTest: Simplify some boolean conditions

Directly compare two boolean values instead of spelling out accepted
combinations.

Issue: #19610
Brad King 6 tahun lalu
induk
melakukan
303e813438
2 mengubah file dengan 2 tambahan dan 4 penghapusan
  1. 1 2
      Source/CTest/cmCTestRunTest.cxx
  2. 1 2
      Source/CTest/cmCTestTestHandler.cxx

+ 1 - 2
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 {

+ 1 - 2
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();
         }