Merge topic 'catch-ctest-errors-better'

d8589e64 ctest: count errors from scripts properly
This commit is contained in:
Brad King 2014-12-12 11:16:04 -05:00 committed by CMake Topic Stage
commit 9f41c45f43
1 changed files with 1 additions and 1 deletions

View File

@ -183,7 +183,7 @@ int cmCTestScriptHandler::ProcessHandler()
for (size_t i=0; i < this->ConfigurationScripts.size(); ++i) for (size_t i=0; i < this->ConfigurationScripts.size(); ++i)
{ {
// for each script run it // for each script run it
res += this->RunConfigurationScript res |= this->RunConfigurationScript
(cmSystemTools::CollapseFullPath(this->ConfigurationScripts[i]), (cmSystemTools::CollapseFullPath(this->ConfigurationScripts[i]),
this->ScriptProcessScope[i]); this->ScriptProcessScope[i]);
} }