Merge branch 'fix-test-RUN_SERIAL-failure-regression' into release
This commit is contained in:
commit
dfdaf70194
|
@ -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;
|
||||
|
|
|
@ -78,6 +78,21 @@ endfunction()
|
|||
|
||||
run_LabelCount()
|
||||
|
||||
function(run_SerialFailed)
|
||||
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SerialFailed)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" "
|
||||
add_test(NoSuchCommand no_such_command)
|
||||
set_tests_properties(NoSuchCommand PROPERTIES RUN_SERIAL ON)
|
||||
add_test(Echo \"${CMAKE_COMMAND}\" -E echo \"EchoTest\")
|
||||
")
|
||||
|
||||
run_cmake_command(SerialFailed ${CMAKE_CTEST_COMMAND} -V)
|
||||
endfunction()
|
||||
run_SerialFailed()
|
||||
|
||||
function(run_TestLoad name load)
|
||||
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestLoad)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
8
|
|
@ -0,0 +1 @@
|
|||
Unable to find executable: no_such_command
|
|
@ -0,0 +1,10 @@
|
|||
Could not find executable no_such_command
|
||||
.*
|
||||
2/2 Test #2: Echo ............................. Passed +[0-9.]+ sec
|
||||
+
|
||||
50% tests passed, 1 tests failed out of 2
|
||||
+
|
||||
Total Test time \(real\) = +[0-9.]+ sec
|
||||
+
|
||||
The following tests FAILED:
|
||||
[ ]+1 - NoSuchCommand \(Not Run\)$
|
Loading…
Reference in New Issue