diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-12 16:16:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-12 16:16:04 (GMT) |
| commit | 9f41c45f4325271a24c96e17853aadac3a081fe8 (patch) | |
| tree | 9f571f055e1c35cc0daea237bb6e7dc18b83017c | |
| parent | f6c8d3d82fca676b127a601db97e6c0d5b7342e4 (diff) | |
| parent | d8589e6437451ef174fc480d0dfc4e83e49b1b30 (diff) | |
| download | CMake-9f41c45f4325271a24c96e17853aadac3a081fe8.zip CMake-9f41c45f4325271a24c96e17853aadac3a081fe8.tar.gz CMake-9f41c45f4325271a24c96e17853aadac3a081fe8.tar.bz2 | |
Merge topic 'catch-ctest-errors-better'
d8589e64 ctest: count errors from scripts properly
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 749eb58..f958e7b 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -183,7 +183,7 @@ int cmCTestScriptHandler::ProcessHandler() for (size_t i=0; i < this->ConfigurationScripts.size(); ++i) { // for each script run it - res += this->RunConfigurationScript + res |= this->RunConfigurationScript (cmSystemTools::CollapseFullPath(this->ConfigurationScripts[i]), this->ScriptProcessScope[i]); } |