diff options
Diffstat (limited to 'Tests/RunCMake/ctest_test')
-rw-r--r-- | Tests/RunCMake/ctest_test/CTestTestLoadWait0-stdout.txt (renamed from Tests/RunCMake/ctest_test/TestLoadWait-stdout.txt) | 4 | ||||
-rw-r--r-- | Tests/RunCMake/ctest_test/CTestTestLoadWait1-stdout.txt | 15 | ||||
-rw-r--r-- | Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 19 | ||||
-rw-r--r-- | Tests/RunCMake/ctest_test/TestLoadWait0-stdout.txt (renamed from Tests/RunCMake/ctest_test/CTestTestLoadWait-stdout.txt) | 4 | ||||
-rw-r--r-- | Tests/RunCMake/ctest_test/TestLoadWait1-stdout.txt | 15 |
5 files changed, 47 insertions, 10 deletions
diff --git a/Tests/RunCMake/ctest_test/TestLoadWait-stdout.txt b/Tests/RunCMake/ctest_test/CTestTestLoadWait0-stdout.txt index fc32958..60d70c9 100644 --- a/Tests/RunCMake/ctest_test/TestLoadWait-stdout.txt +++ b/Tests/RunCMake/ctest_test/CTestTestLoadWait0-stdout.txt @@ -1,8 +1,8 @@ Test project [^ -]*/Tests/RunCMake/ctest_test/TestLoadWait-build( +]*/Tests/RunCMake/ctest_test/CTestTestLoadWait0-build( [^*][^ ]*)* -\*\*\*\*\* WAITING, System Load: 5, Max Allowed Load: 2, Smallest test RunCMakeVersion requires 1\*\*\*\*\* +\*\*\*\*\* WAITING, System Load: 7, Max Allowed Load: 6\*\*\*\*\* test 1 Start 1: RunCMakeVersion +( diff --git a/Tests/RunCMake/ctest_test/CTestTestLoadWait1-stdout.txt b/Tests/RunCMake/ctest_test/CTestTestLoadWait1-stdout.txt new file mode 100644 index 0000000..70d8d3e --- /dev/null +++ b/Tests/RunCMake/ctest_test/CTestTestLoadWait1-stdout.txt @@ -0,0 +1,15 @@ +Test project [^ +]*/Tests/RunCMake/ctest_test/CTestTestLoadWait1-build( +[^*][^ +]*)* +\*\*\*\*\* WAITING, System Load: 7, Max Allowed Load: 8, Smallest test RunCMakeVersion requires 2\*\*\*\*\* +test 1 + Start 1: RunCMakeVersion ++( +[^*][^ +]*)* +1/1 Test #1: RunCMakeVersion .................. Passed +[0-9.]+ sec ++ +100% tests passed, 0 tests failed out of 1 ++ +Total Test time \(real\) = +[0-9.]+ sec$ diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake index d2f3da3..b1ec9ad 100644 --- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake @@ -14,16 +14,20 @@ run_ctest_test(TestQuiet QUIET) # Tests for the 'Test Load' feature of ctest # # Spoof a load average value to make these tests more reliable. -set(ENV{__CTEST_FAKE_LOAD_AVERAGE_FOR_TESTING} 5) +set(ENV{__CTEST_FAKE_LOAD_AVERAGE_FOR_TESTING} 7) set(RunCTest_VERBOSE_FLAG -VV) +set(CASE_CMAKELISTS_SUFFIX_CODE [[ +set_property(TEST RunCMakeVersion PROPERTY PROCESSORS 2) +]]) # Verify that new tests are started when the load average falls below # our threshold. -run_ctest_test(TestLoadPass TEST_LOAD 6) +run_ctest_test(TestLoadPass TEST_LOAD 8) # Verify that new tests are not started when the load average exceeds # our threshold and that they then run once the load average drops. -run_ctest_test(TestLoadWait TEST_LOAD 2) +run_ctest_test(TestLoadWait0 TEST_LOAD 4 PARALLEL_LEVEL 8) +run_ctest_test(TestLoadWait1 TEST_LOAD 8 PARALLEL_LEVEL 8) # Verify that when an invalid "TEST_LOAD" value is given, a warning # message is displayed and the value is ignored. @@ -31,13 +35,15 @@ run_ctest_test(TestLoadInvalid TEST_LOAD "ERR1") # Verify that new tests are started when the load average falls below # our threshold. -set(CASE_CTEST_TEST_LOAD 7) +set(CASE_CTEST_TEST_LOAD 9) run_ctest_test(CTestTestLoadPass) # Verify that new tests are not started when the load average exceeds # our threshold and that they then run once the load average drops. -set(CASE_CTEST_TEST_LOAD 4) -run_ctest_test(CTestTestLoadWait) +set(CASE_CTEST_TEST_LOAD 6) +run_ctest_test(CTestTestLoadWait0 PARALLEL_LEVEL 8) +set(CASE_CTEST_TEST_LOAD 8) +run_ctest_test(CTestTestLoadWait1 PARALLEL_LEVEL 8) # Verify that when an invalid "CTEST_TEST_LOAD" value is given, # a warning message is displayed and the value is ignored. @@ -51,6 +57,7 @@ run_ctest_test(TestLoadOrder TEST_LOAD "ERR4") unset(ENV{__CTEST_FAKE_LOAD_AVERAGE_FOR_TESTING}) unset(CASE_CTEST_TEST_LOAD) +unset(CASE_CMAKELISTS_SUFFIX_CODE) unset(RunCTest_VERBOSE_FLAG) block() diff --git a/Tests/RunCMake/ctest_test/CTestTestLoadWait-stdout.txt b/Tests/RunCMake/ctest_test/TestLoadWait0-stdout.txt index 2f4468f..c7172aa 100644 --- a/Tests/RunCMake/ctest_test/CTestTestLoadWait-stdout.txt +++ b/Tests/RunCMake/ctest_test/TestLoadWait0-stdout.txt @@ -1,8 +1,8 @@ Test project [^ -]*/Tests/RunCMake/ctest_test/CTestTestLoadWait-build( +]*/Tests/RunCMake/ctest_test/TestLoadWait0-build( [^*][^ ]*)* -\*\*\*\*\* WAITING, System Load: 5, Max Allowed Load: 4, Smallest test RunCMakeVersion requires 1\*\*\*\*\* +\*\*\*\*\* WAITING, System Load: 7, Max Allowed Load: 4\*\*\*\*\* test 1 Start 1: RunCMakeVersion +( diff --git a/Tests/RunCMake/ctest_test/TestLoadWait1-stdout.txt b/Tests/RunCMake/ctest_test/TestLoadWait1-stdout.txt new file mode 100644 index 0000000..bca3e54 --- /dev/null +++ b/Tests/RunCMake/ctest_test/TestLoadWait1-stdout.txt @@ -0,0 +1,15 @@ +Test project [^ +]*/Tests/RunCMake/ctest_test/TestLoadWait1-build( +[^*][^ +]*)* +\*\*\*\*\* WAITING, System Load: 7, Max Allowed Load: 8, Smallest test RunCMakeVersion requires 2\*\*\*\*\* +test 1 + Start 1: RunCMakeVersion ++( +[^*][^ +]*)* +1/1 Test #1: RunCMakeVersion .................. Passed +[0-9.]+ sec ++ +100% tests passed, 0 tests failed out of 1 ++ +Total Test time \(real\) = +[0-9.]+ sec$ |