This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, master has been updated via 449fceeb1fd9619d9b01f8aed0e9e5784e10dacb (commit) via bea26f5aa0e1b98dea9d87ba2444c0901842f97c (commit) via 87dcbe0b2122ee9cfea81369a45d15b22853ba90 (commit) via 016601e5e6f152403306c12997534aadd4287d38 (commit) via c1435d98120dff203de01d75f8f91e99bc75fe2b (commit) via eb9d945f142ac7638baaf879fb9464fa39e3e9a7 (commit) via c544cb66984f16cc63ebace16ccd911adc550b9d (commit) via 6ce27d3a2efad4e40d4354a7d17e4259fb4c1e24 (commit) via a7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa (commit) via 73a40b19ffa49bfc92fbe10bd0fd3821b7facae6 (commit) via af9ed543b0f9d032158f91cdce7ad6908ff9365b (commit) from 74569996e8fe798386cca2d4241acea0644f6275 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=449fceeb1fd9619d9b01f8aed0e9e5784e10dacb commit 449fceeb1fd9619d9b01f8aed0e9e5784e10dacb Merge: bea26f5aa0 87dcbe0b21 Author: Kyle Edwards <kyle.edwa...@kitware.com> AuthorDate: Thu Nov 7 18:10:46 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Thu Nov 7 13:10:57 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bea26f5aa0e1b98dea9d87ba2444c0901842f97c commit bea26f5aa0e1b98dea9d87ba2444c0901842f97c Merge: 74569996e8 016601e5e6 Author: Kyle Edwards <kyle.edwa...@kitware.com> AuthorDate: Thu Nov 7 18:10:46 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Thu Nov 7 13:10:57 2019 -0500 Merge topic 'ctest-resource-groups' 016601e5e6 Merge branch 'backport-ctest-resource-groups' c1435d9812 Help: Fix error in resource allocation example eb9d945f14 CTest: Rename hardware -> resources for RunCMake tests c544cb6698 CTest: Rename hardware -> resources for source code 6ce27d3a2e cmCTestMultiProcessHandler: Rename resource locking functions a7c1e15cc4 CTest: Rename hardware -> resources for CMake variables, command options 73a40b19ff CTest: Rename "Processes" lexer to "ResourceGroups" af9ed543b0 CTest: Rename PROCESSES test property to RESOURCE_GROUPS Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3994 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=016601e5e6f152403306c12997534aadd4287d38 commit 016601e5e6f152403306c12997534aadd4287d38 Merge: 370fe1495b c1435d9812 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Nov 5 12:59:16 2019 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Nov 5 12:59:16 2019 -0500 Merge branch 'backport-ctest-resource-groups' diff --cc Source/CTest/cmCTestRunTest.h index 881cbb6486,f781c7ab0d..d5e83d9e4d --- a/Source/CTest/cmCTestRunTest.h +++ b/Source/CTest/cmCTestRunTest.h @@@ -129,14 -128,13 +132,14 @@@ private std::string StartTime; std::string ActualCommand; std::vector<std::string> Arguments; - bool UseAllocatedHardware = false; + bool UseAllocatedResources = false; std::vector<std::map< - std::string, std::vector<cmCTestMultiProcessHandler::HardwareAllocation>>> - AllocatedHardware; + std::string, std::vector<cmCTestMultiProcessHandler::ResourceAllocation>>> + AllocatedResources; - bool RunUntilFail; - int NumberOfRunsLeft; - bool RunAgain; + cmCTest::Rerun RerunMode = cmCTest::Rerun::Never; + int NumberOfRunsLeft = 1; // default to 1 run of the test + int NumberOfRunsTotal = 1; // default to 1 run of the test + bool RunAgain = false; // default to not having to run again size_t TotalNumberOfTests; }; diff --cc Source/ctest.cxx index 2659e3071b,0d65902ef0..a7b11cd944 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@@ -99,14 -99,11 +99,14 @@@ static const char* cmDocumentationOptio { "-U, --union", "Take the Union of -I and -R" }, { "--rerun-failed", "Run only the tests that failed previously" }, { "--repeat-until-fail <n>", - "Require each test to run <n> " - "times without failing in order to pass" }, + "Require each test to run <n> times without failing in order to pass" }, + { "--repeat-until-pass <n>", + "Allow each test to run up to <n> times in order to pass" }, + { "--repeat-after-timeout <n>", + "Allow each test to run up to <n> times if it times out" }, { "--max-width <width>", "Set the max width for a test name to output" }, { "--interactive-debug-mode [0|1]", "Set the interactive mode to 0 or 1." }, - { "--hardware-spec-file <file>", "Set the hardware spec file to use." }, + { "--resource-spec-file <file>", "Set the resource spec file to use." }, { "--no-label-summary", "Disable timing summary information for labels." }, { "--no-subproject-summary", "Disable timing summary information for " ----------------------------------------------------------------------- Summary of changes: Help/command/ctest_test.rst | 8 +- Help/manual/cmake-properties.7.rst | 2 +- Help/manual/ctest.1.rst | 143 ++++++------ Help/prop_test/PROCESSES.rst | 54 ----- Help/prop_test/RESOURCE_GROUPS.rst | 54 +++++ Help/prop_test/RESOURCE_LOCK.rst | 14 +- Help/release/3.16.rst | 4 +- Source/CMakeLists.txt | 12 +- Source/CTest/cmCTestBinPacker.cxx | 132 +++++------ Source/CTest/cmCTestBinPacker.h | 10 +- Source/CTest/cmCTestMultiProcessHandler.cxx | 101 +++++---- Source/CTest/cmCTestMultiProcessHandler.h | 32 +-- Source/CTest/cmCTestProcessesLexerHelper.cxx | 55 ----- ...eAllocator.cxx => cmCTestResourceAllocator.cxx} | 20 +- ...dwareAllocator.h => cmCTestResourceAllocator.h} | 10 +- Source/CTest/cmCTestResourceGroupsLexerHelper.cxx | 55 +++++ ...Helper.h => cmCTestResourceGroupsLexerHelper.h} | 12 +- ...estHardwareSpec.cxx => cmCTestResourceSpec.cxx} | 28 +-- ...cmCTestHardwareSpec.h => cmCTestResourceSpec.h} | 10 +- Source/CTest/cmCTestRunTest.cxx | 16 +- Source/CTest/cmCTestRunTest.h | 21 +- Source/CTest/cmCTestTestCommand.cxx | 6 +- Source/CTest/cmCTestTestCommand.h | 2 +- Source/CTest/cmCTestTestHandler.cxx | 28 +-- Source/CTest/cmCTestTestHandler.h | 12 +- Source/LexerParser/.gitattributes | 4 +- ...sesLexer.cxx => cmCTestResourceGroupsLexer.cxx} | 168 +++++++------- ...ocessesLexer.h => cmCTestResourceGroupsLexer.h} | 252 ++++++++++----------- ...sLexer.in.l => cmCTestResourceGroupsLexer.in.l} | 38 ++-- Source/cmCTest.cxx | 6 +- Source/ctest.cxx | 2 +- Tests/CMakeLib/CMakeLists.txt | 8 +- Tests/CMakeLib/testCTestBinPacker.cxx | 18 +- ...llocator.cxx => testCTestResourceAllocator.cxx} | 66 +++--- ...stProcesses.cxx => testCTestResourceGroups.cxx} | 11 +- ...tHardwareSpec.cxx => testCTestResourceSpec.cxx} | 16 +- .../spec1.json | 0 .../spec10.json | 0 .../spec11.json | 0 .../spec12.json | 0 .../spec13.json | 0 .../spec14.json | 0 .../spec15.json | 0 .../spec16.json | 0 .../spec17.json | 0 .../spec18.json | 0 .../spec2.json | 0 .../spec3.json | 0 .../spec4.json | 0 .../spec5.json | 0 .../spec6.json | 0 .../spec7.json | 0 .../spec8.json | 0 .../spec9.json | 0 Tests/RunCMake/CMakeLists.txt | 24 +- Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 2 +- .../CTestCommandLine/show-only_json-v1_check.py | 6 +- .../CTestHardwareAllocation/HardwareCommon.cmake | 23 -- .../CTestHardwareAllocation/RunCMakeTest.cmake | 167 -------------- .../checkfree1-ctest-s-hw-check.cmake | 1 - .../CTestHardwareAllocation/checkfree1.cmake | 7 - .../checkfree2-ctest-s-hw-check.cmake | 1 - .../CTestHardwareAllocation/checkfree2.cmake | 8 - .../cthwalloc-write-proc-good2-check.cmake | 6 - .../lotsoftests-ctest-s-hw-check.cmake | 1 - .../CTestHardwareAllocation/lotsoftests.cmake | 16 -- .../notenough1-ctest-s-hw-check.cmake | 3 - .../notenough1-ctest-s-hw-stderr.txt | 4 - .../CTestHardwareAllocation/notenough1.cmake | 5 - .../notenough2-ctest-s-hw-check.cmake | 3 - .../notenough2-ctest-s-hw-stderr.txt | 4 - .../CTestHardwareAllocation/notenough2.cmake | 5 - .../process_count-ctest-s-hw-check.cmake | 1 - .../CTestHardwareAllocation/process_count.cmake | 5 - .../CMakeLists.txt.in | 2 +- .../CTestResourceAllocation/ResourceCommon.cmake | 23 ++ .../CTestResourceAllocation/RunCMakeTest.cmake | 167 ++++++++++++++ .../checkfree1-ctest-s-res-check.cmake | 1 + .../CTestResourceAllocation/checkfree1.cmake | 7 + .../checkfree2-ctest-s-res-check.cmake | 1 + .../CTestResourceAllocation/checkfree2.cmake | 8 + .../ctresalloc-verify-baddealloc-result.txt} | 0 .../ctresalloc-verify-baddealloc.log} | 0 .../ctresalloc-verify-badtest1-result.txt} | 0 .../ctresalloc-verify-badtest1.log} | 0 .../ctresalloc-verify-badtest2-result.txt} | 0 .../ctresalloc-verify-badtest2.log} | 0 .../ctresalloc-verify-badtest3-result.txt} | 0 .../ctresalloc-verify-badtest3.log} | 0 .../ctresalloc-verify-badtest4-result.txt} | 0 .../ctresalloc-verify-badtest4.log} | 0 .../ctresalloc-verify-badtest5-result.txt} | 0 .../ctresalloc-verify-badtest5.log} | 0 .../ctresalloc-verify-good1.log} | 0 .../ctresalloc-verify-good2.log} | 0 .../ctresalloc-verify-leak-result.txt} | 0 .../ctresalloc-verify-leak.log} | 0 .../ctresalloc-verify-nobegin-result.txt} | 0 .../ctresalloc-verify-nobegin.log} | 0 .../ctresalloc-verify-noend-result.txt} | 0 .../ctresalloc-verify-noend.log} | 0 .../ctresalloc-verify-noid-result.txt} | 0 .../ctresalloc-verify-noid.log} | 0 .../ctresalloc-verify-nolog-result.txt} | 0 .../ctresalloc-verify-nores-result.txt} | 0 .../ctresalloc-verify-nores.log} | 0 .../ctresalloc-verify-notenough-result.txt} | 0 .../ctresalloc-verify-notenough.log} | 0 .../ctresalloc-write-noproc-count-result.txt} | 0 .../ctresalloc-write-proc-badcount-result.txt} | 0 .../ctresalloc-write-proc-badres-result.txt} | 0 .../ctresalloc-write-proc-badwidgets1-result.txt} | 0 .../ctresalloc-write-proc-badwidgets2-result.txt} | 0 .../ctresalloc-write-proc-badwidgets3-result.txt} | 0 .../ctresalloc-write-proc-badwidgets4-result.txt} | 0 .../ctresalloc-write-proc-badwidgets5-result.txt} | 0 .../ctresalloc-write-proc-badwidgets6-result.txt} | 0 .../ctresalloc-write-proc-badwidgets7-result.txt} | 0 .../ctresalloc-write-proc-good1-check.cmake} | 6 +- .../ctresalloc-write-proc-good2-check.cmake | 6 + .../ctresalloc-write-proc-nocount-result.txt} | 0 .../ctresalloc-write-proc-nores-result.txt} | 0 .../ctresalloc-write-proc-nowidgets-result.txt} | 0 .../ctresalloc.cxx} | 99 ++++---- .../ensure_parallel-ctest-s-res-check.cmake} | 6 +- .../ensure_parallel.cmake | 8 +- .../lotsoftests-ctest-s-res-check.cmake | 1 + .../CTestResourceAllocation/lotsoftests.cmake | 16 ++ .../notenough1-ctest-s-res-check.cmake | 3 + .../notenough1-ctest-s-res-result.txt} | 0 .../notenough1-ctest-s-res-stderr.txt | 4 + .../CTestResourceAllocation/notenough1.cmake | 5 + .../notenough2-ctest-s-res-check.cmake | 3 + .../notenough2-ctest-s-res-result.txt} | 0 .../notenough2-ctest-s-res-stderr.txt | 4 + .../CTestResourceAllocation/notenough2.cmake | 5 + .../process_count-ctest-s-res-check.cmake | 1 + .../CTestResourceAllocation/process_count.cmake | 5 + .../resspec.json} | 0 .../test.cmake.in | 8 +- Utilities/Scripts/regenerate-lexers.bash | 2 +- 141 files changed, 1062 insertions(+), 1051 deletions(-) delete mode 100644 Help/prop_test/PROCESSES.rst create mode 100644 Help/prop_test/RESOURCE_GROUPS.rst delete mode 100644 Source/CTest/cmCTestProcessesLexerHelper.cxx rename Source/CTest/{cmCTestHardwareAllocator.cxx => cmCTestResourceAllocator.cxx} (76%) rename Source/CTest/{cmCTestHardwareAllocator.h => cmCTestResourceAllocator.h} (81%) create mode 100644 Source/CTest/cmCTestResourceGroupsLexerHelper.cxx rename Source/CTest/{cmCTestProcessesLexerHelper.h => cmCTestResourceGroupsLexerHelper.h} (76%) rename Source/CTest/{cmCTestHardwareSpec.cxx => cmCTestResourceSpec.cxx} (78%) rename Source/CTest/{cmCTestHardwareSpec.h => cmCTestResourceSpec.h} (76%) rename Source/LexerParser/{cmCTestProcessesLexer.cxx => cmCTestResourceGroupsLexer.cxx} (92%) rename Source/LexerParser/{cmCTestProcessesLexer.h => cmCTestResourceGroupsLexer.h} (59%) rename Source/LexerParser/{cmCTestProcessesLexer.in.l => cmCTestResourceGroupsLexer.in.l} (61%) rename Tests/CMakeLib/{testCTestHardwareAllocator.cxx => testCTestResourceAllocator.cxx} (83%) rename Tests/CMakeLib/{testCTestProcesses.cxx => testCTestResourceGroups.cxx} (89%) rename Tests/CMakeLib/{testCTestHardwareSpec.cxx => testCTestResourceSpec.cxx} (81%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec1.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec10.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec11.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec12.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec13.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec14.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec15.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec16.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec17.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec18.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec2.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec3.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec4.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec5.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec6.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec7.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec8.json (100%) rename Tests/CMakeLib/{testCTestHardwareSpec_data => testCTestResourceSpec_data}/spec9.json (100%) delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/HardwareCommon.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/RunCMakeTest.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/checkfree1-ctest-s-hw-check.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/checkfree1.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/checkfree2-ctest-s-hw-check.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/checkfree2.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/cthwalloc-write-proc-good2-check.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/lotsoftests-ctest-s-hw-check.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/lotsoftests.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/notenough1-ctest-s-hw-check.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/notenough1-ctest-s-hw-stderr.txt delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/notenough1.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/notenough2-ctest-s-hw-check.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/notenough2-ctest-s-hw-stderr.txt delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/notenough2.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/process_count-ctest-s-hw-check.cmake delete mode 100644 Tests/RunCMake/CTestHardwareAllocation/process_count.cmake rename Tests/RunCMake/{CTestHardwareAllocation => CTestResourceAllocation}/CMakeLists.txt.in (81%) create mode 100644 Tests/RunCMake/CTestResourceAllocation/ResourceCommon.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/checkfree1-ctest-s-res-check.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/checkfree1.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/checkfree2-ctest-s-res-check.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/checkfree2.cmake rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-baddealloc-result.txt => CTestResourceAllocation/ctresalloc-verify-baddealloc-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-baddealloc.log => CTestResourceAllocation/ctresalloc-verify-baddealloc.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest1-result.txt => CTestResourceAllocation/ctresalloc-verify-badtest1-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest1.log => CTestResourceAllocation/ctresalloc-verify-badtest1.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest2-result.txt => CTestResourceAllocation/ctresalloc-verify-badtest2-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest2.log => CTestResourceAllocation/ctresalloc-verify-badtest2.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest3-result.txt => CTestResourceAllocation/ctresalloc-verify-badtest3-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest3.log => CTestResourceAllocation/ctresalloc-verify-badtest3.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest4-result.txt => CTestResourceAllocation/ctresalloc-verify-badtest4-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest4.log => CTestResourceAllocation/ctresalloc-verify-badtest4.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest5-result.txt => CTestResourceAllocation/ctresalloc-verify-badtest5-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-badtest5.log => CTestResourceAllocation/ctresalloc-verify-badtest5.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-good1.log => CTestResourceAllocation/ctresalloc-verify-good1.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-good2.log => CTestResourceAllocation/ctresalloc-verify-good2.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-leak-result.txt => CTestResourceAllocation/ctresalloc-verify-leak-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-leak.log => CTestResourceAllocation/ctresalloc-verify-leak.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-nobegin-result.txt => CTestResourceAllocation/ctresalloc-verify-nobegin-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-nobegin.log => CTestResourceAllocation/ctresalloc-verify-nobegin.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-noend-result.txt => CTestResourceAllocation/ctresalloc-verify-noend-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-noend.log => CTestResourceAllocation/ctresalloc-verify-noend.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-noid-result.txt => CTestResourceAllocation/ctresalloc-verify-noid-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-noid.log => CTestResourceAllocation/ctresalloc-verify-noid.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-nolog-result.txt => CTestResourceAllocation/ctresalloc-verify-nolog-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-nores-result.txt => CTestResourceAllocation/ctresalloc-verify-nores-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-nores.log => CTestResourceAllocation/ctresalloc-verify-nores.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-notenough-result.txt => CTestResourceAllocation/ctresalloc-verify-notenough-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-verify-notenough.log => CTestResourceAllocation/ctresalloc-verify-notenough.log} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-noproc-count-result.txt => CTestResourceAllocation/ctresalloc-write-noproc-count-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badcount-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badcount-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badres-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badres-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badwidgets1-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badwidgets1-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badwidgets2-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badwidgets2-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badwidgets3-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badwidgets3-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badwidgets4-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badwidgets4-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badwidgets5-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badwidgets5-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badwidgets6-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badwidgets6-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-badwidgets7-result.txt => CTestResourceAllocation/ctresalloc-write-proc-badwidgets7-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-good1-check.cmake => CTestResourceAllocation/ctresalloc-write-proc-good1-check.cmake} (78%) create mode 100644 Tests/RunCMake/CTestResourceAllocation/ctresalloc-write-proc-good2-check.cmake rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-nocount-result.txt => CTestResourceAllocation/ctresalloc-write-proc-nocount-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-nores-result.txt => CTestResourceAllocation/ctresalloc-write-proc-nores-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc-write-proc-nowidgets-result.txt => CTestResourceAllocation/ctresalloc-write-proc-nowidgets-result.txt} (100%) rename Tests/RunCMake/{CTestHardwareAllocation/cthwalloc.cxx => CTestResourceAllocation/ctresalloc.cxx} (79%) rename Tests/RunCMake/{CTestHardwareAllocation/ensure_parallel-ctest-s-hw-check.cmake => CTestResourceAllocation/ensure_parallel-ctest-s-res-check.cmake} (58%) rename Tests/RunCMake/{CTestHardwareAllocation => CTestResourceAllocation}/ensure_parallel.cmake (61%) create mode 100644 Tests/RunCMake/CTestResourceAllocation/lotsoftests-ctest-s-res-check.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/lotsoftests.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/notenough1-ctest-s-res-check.cmake rename Tests/RunCMake/{CTestHardwareAllocation/notenough1-ctest-s-hw-result.txt => CTestResourceAllocation/notenough1-ctest-s-res-result.txt} (100%) create mode 100644 Tests/RunCMake/CTestResourceAllocation/notenough1-ctest-s-res-stderr.txt create mode 100644 Tests/RunCMake/CTestResourceAllocation/notenough1.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/notenough2-ctest-s-res-check.cmake rename Tests/RunCMake/{CTestHardwareAllocation/notenough2-ctest-s-hw-result.txt => CTestResourceAllocation/notenough2-ctest-s-res-result.txt} (100%) create mode 100644 Tests/RunCMake/CTestResourceAllocation/notenough2-ctest-s-res-stderr.txt create mode 100644 Tests/RunCMake/CTestResourceAllocation/notenough2.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/process_count-ctest-s-res-check.cmake create mode 100644 Tests/RunCMake/CTestResourceAllocation/process_count.cmake rename Tests/RunCMake/{CTestHardwareAllocation/hwspec.json => CTestResourceAllocation/resspec.json} (100%) rename Tests/RunCMake/{CTestHardwareAllocation => CTestResourceAllocation}/test.cmake.in (66%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits