summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2003-12-18 22:36:27 (GMT)
committerKen Martin <ken.martin@kitware.com>2003-12-18 22:36:27 (GMT)
commitd3a68a23a7c061593440e638376eead943f840b5 (patch)
treea0b36d13e3937e64eb7ab189e366e280ce9d5333
parent1b2f84a7275f89ed57547af592e52e62c20e839c (diff)
downloadCMake-d3a68a23a7c061593440e638376eead943f840b5.zip
CMake-d3a68a23a7c061593440e638376eead943f840b5.tar.gz
CMake-d3a68a23a7c061593440e638376eead943f840b5.tar.bz2
bug fix
-rw-r--r--Source/cmCTest.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index dbaf112..9ecbfea 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2994,7 +2994,7 @@ int cmCTest::RunConfigurationScript()
// did something critical fail in ctest
if (!res ||
- retVal | CTEST_BUILD_ERRORS)
+ retVal & CTEST_BUILD_ERRORS)
{
// if we backed up the dirs and the build failed, then restore
// the backed up dirs
@@ -3014,7 +3014,11 @@ int cmCTest::RunConfigurationScript()
rename(backupBinDir.c_str(), binDir);
}
cmSystemTools::Error("Unable to run ctest");
- return -8;
+ if (!res)
+ {
+ return -8;
+ }
+ return retVal;
}
return 0;