diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-09 15:11:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-10 11:32:16 (GMT) |
| commit | 292ec157b67b5570d5bc2e00bba554cc157d9dae (patch) | |
| tree | 47976098727357d9d9117ae3f320940ec8edd670 /Tests/RunCMake/ctest_test/RunCMakeTest.cmake | |
| parent | f478fa633daeb1432805821adddc40730ffd283d (diff) | |
| download | CMake-292ec157b67b5570d5bc2e00bba554cc157d9dae.zip CMake-292ec157b67b5570d5bc2e00bba554cc157d9dae.tar.gz CMake-292ec157b67b5570d5bc2e00bba554cc157d9dae.tar.bz2 | |
CTest: Fix --test-load regression
The `ctest --test-load` option is implemented in `StartNextTests` by not
starting any tests when the load is too high and instead sleeping and
then returning. Prior to commit v3.11.0-rc1~117^2 (CTest: Re-implement
test process handling using libuv, 2017-12-10) our outer loop in
`RunTests` would immediately call `StartNextTests` again. However, now
the `uv_run` loop may simply terminate if there are no tests running
because no events are left pending.
Fix this by converting the sleep in `StartNextTests` into a libuv timer
that it starts instead. This avoids leaving `uv_run` with no pending
events. In the case that there are other running tests this also allows
CTest to detect when they finish even if it during the wait period where
we previously slept.
This regression was not caught by the test suite because it only
verified that we do not start new tests when the load was too high and
not that we proceed to start tests when the load drops. Revise the test
suite to cover both.
Fixes: #18338
Diffstat (limited to 'Tests/RunCMake/ctest_test/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake index 1b31726..6877e6a 100644 --- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake @@ -21,8 +21,8 @@ set(ENV{__CTEST_FAKE_LOAD_AVERAGE_FOR_TESTING} 5) run_ctest_test(TestLoadPass TEST_LOAD 6) # Verify that new tests are not started when the load average exceeds -# our threshold. -run_ctest_test(TestLoadFail TEST_LOAD 2) +# our threshold and that they then run once the load average drops. +run_ctest_test(TestLoadWait TEST_LOAD 2) # Verify that when an invalid "TEST_LOAD" value is given, a warning # message is displayed and the value is ignored. @@ -34,9 +34,9 @@ set(CASE_CTEST_TEST_LOAD 7) run_ctest_test(CTestTestLoadPass) # Verify that new tests are not started when the load average exceeds -# our threshold. +# our threshold and that they then run once the load average drops. set(CASE_CTEST_TEST_LOAD 4) -run_ctest_test(CTestTestLoadFail) +run_ctest_test(CTestTestLoadWait) # Verify that when an invalid "CTEST_TEST_LOAD" value is given, # a warning message is displayed and the value is ignored. |