Ken Martin 22 年之前
父節點
當前提交
d3a68a23a7
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      Source/cmCTest.cxx

+ 6 - 2
Source/cmCTest.cxx

@@ -2994,7 +2994,7 @@ int cmCTest::RunConfigurationScript()
 
 
   // did something critical fail in ctest
   // did something critical fail in ctest
   if (!res || 
   if (!res || 
-      retVal | CTEST_BUILD_ERRORS)
+      retVal & CTEST_BUILD_ERRORS)
     {
     {
     // if we backed up the dirs and the build failed, then restore
     // if we backed up the dirs and the build failed, then restore
     // the backed up dirs
     // the backed up dirs
@@ -3014,7 +3014,11 @@ int cmCTest::RunConfigurationScript()
       rename(backupBinDir.c_str(), binDir);
       rename(backupBinDir.c_str(), binDir);
       }
       }
     cmSystemTools::Error("Unable to run ctest");    
     cmSystemTools::Error("Unable to run ctest");    
-    return -8;
+    if (!res)
+      {
+      return -8;
+      }
+    return retVal;
     }
     }
 
 
   return 0;  
   return 0;