diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-26 17:12:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-26 17:12:50 (GMT) |
| commit | f054552124bfffce3b15c3422ceb39acec9b8b6a (patch) | |
| tree | 2458e3a60146e917d1870648d708a9c0b172975e /Source/CTest | |
| parent | 8e86e113bc738cf3cce13991ff6208305f950206 (diff) | |
| parent | e61973e1ab2c01f9ae5df145bfdc14e83a0cf1d9 (diff) | |
| download | CMake-f054552124bfffce3b15c3422ceb39acec9b8b6a.zip CMake-f054552124bfffce3b15c3422ceb39acec9b8b6a.tar.gz CMake-f054552124bfffce3b15c3422ceb39acec9b8b6a.tar.bz2 | |
Merge topic 'fix-test-RUN_SERIAL-failure-regression'
e61973e1 CTest: Fix regression in handling of a RUN_SERIAL test that fails
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 4832186..7c7f5df 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -198,6 +198,10 @@ void cmCTestMultiProcessHandler::UnlockResources(int index) { this->LockedResources.erase(*i); } + if (this->Properties[index]->RunSerial) + { + this->SerialTestRunning = false; + } } //--------------------------------------------------------- @@ -451,11 +455,6 @@ bool cmCTestMultiProcessHandler::CheckOutput() this->WriteCheckpoint(test); this->UnlockResources(test); this->RunningCount -= GetProcessorsUsed(test); - if (this->Properties[test]->RunSerial) - { - this->SerialTestRunning = false; - } - delete p; } return true; |