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 ff198efc77e7b2401aa5cc4d7b6b7c91838dde7b (commit)
via 3d5227e6b654b7c49c3d0cbc633d832104a0a7fe (commit)
via b1175431c385cb052769d4575576ebb19b6e594b (commit)
via a033bafbe01fcb4654f075955e0b3de7be81b0f7 (commit)
via eafce6c2562a76ef33c2258d2fef04aae2b4e6e9 (commit)
via 4e4327ee3cbcbb083a0a5aa44b8d932728d30d3f (commit)
via a64ba0235fbacfe58751c222997bdd74cf973359 (commit)
via f9f294f5faf980aa39721e4deb465b2e9dbbbd9a (commit)
from 8741d9e262a66de86fac6008bbf466dc25f72ec6 (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=ff198efc77e7b2401aa5cc4d7b6b7c91838dde7b
commit ff198efc77e7b2401aa5cc4d7b6b7c91838dde7b
Merge: 3d5227e6b6 b1175431c3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 26 14:12:25 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 26 09:12:34 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d5227e6b654b7c49c3d0cbc633d832104a0a7fe
commit 3d5227e6b654b7c49c3d0cbc633d832104a0a7fe
Merge: eafce6c256 a033bafbe0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 26 14:12:25 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 26 09:12:34 2019 -0500
Merge topic 'ctest-resource-fixes'
a033bafbe0 Help: Clarify how tests are run if no resource spec file is
specified
a64ba0235f CTest: Clarify that resource requirements can be split
f9f294f5fa CTest: Add version field to resource spec file
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4080
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eafce6c2562a76ef33c2258d2fef04aae2b4e6e9
commit eafce6c2562a76ef33c2258d2fef04aae2b4e6e9
Merge: 8741d9e262 4e4327ee3c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 26 09:03:54 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 26 09:03:54 2019 -0500
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e4327ee3cbcbb083a0a5aa44b8d932728d30d3f
commit 4e4327ee3cbcbb083a0a5aa44b8d932728d30d3f
Merge: 61ce9d1769 4b46523d90
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 26 09:03:08 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 26 09:03:14 2019 -0500
Merge branch 'backport-implicit-includes-extra-CR' into release-3.15
Merge-request: !4088
-----------------------------------------------------------------------
Summary of changes:
Help/manual/ctest.1.rst | 26 ++++++++++++++++++++++
Help/prop_test/RESOURCE_GROUPS.rst | 16 +++++++++++++
Source/CTest/cmCTestResourceSpec.cxx | 26 ++++++++++++++++++++++
Tests/CMakeLib/testCTestResourceGroups.cxx | 3 +++
Tests/CMakeLib/testCTestResourceSpec.cxx | 17 ++++++++++++++
.../CMakeLib/testCTestResourceSpec_data/spec1.json | 4 ++++
.../testCTestResourceSpec_data/spec10.json | 4 ++++
.../testCTestResourceSpec_data/spec11.json | 4 ++++
.../testCTestResourceSpec_data/spec14.json | 4 ++++
.../testCTestResourceSpec_data/spec15.json | 4 ++++
.../testCTestResourceSpec_data/spec16.json | 4 ++++
.../testCTestResourceSpec_data/spec17.json | 4 ++++
.../testCTestResourceSpec_data/spec18.json | 4 ++++
.../{spec6.json => spec19.json} | 2 +-
.../CMakeLib/testCTestResourceSpec_data/spec2.json | 4 ++++
.../testCTestResourceSpec_data/spec20.json | 8 +++++++
.../{spec6.json => spec21.json} | 2 +-
.../{spec6.json => spec22.json} | 2 +-
.../testCTestResourceSpec_data/spec23.json | 7 ++++++
.../testCTestResourceSpec_data/spec24.json | 7 ++++++
.../testCTestResourceSpec_data/spec25.json | 8 +++++++
.../testCTestResourceSpec_data/spec26.json | 8 +++++++
.../testCTestResourceSpec_data/spec27.json | 8 +++++++
.../testCTestResourceSpec_data/spec28.json | 8 +++++++
.../testCTestResourceSpec_data/spec29.json | 5 +++++
.../CMakeLib/testCTestResourceSpec_data/spec3.json | 4 ++++
.../{spec6.json => spec30.json} | 2 +-
.../{spec6.json => spec31.json} | 2 +-
.../{spec6.json => spec32.json} | 2 +-
.../testCTestResourceSpec_data/spec33.json | 5 +++++
.../testCTestResourceSpec_data/spec34.json | 5 +++++
.../{spec6.json => spec35.json} | 2 +-
.../CMakeLib/testCTestResourceSpec_data/spec4.json | 4 ++++
.../CMakeLib/testCTestResourceSpec_data/spec5.json | 4 ++++
.../CMakeLib/testCTestResourceSpec_data/spec6.json | 4 ++++
.../CMakeLib/testCTestResourceSpec_data/spec7.json | 4 ++++
.../CMakeLib/testCTestResourceSpec_data/spec8.json | 4 ++++
.../CMakeLib/testCTestResourceSpec_data/spec9.json | 4 ++++
.../CTestResourceAllocation/RunCMakeTest.cmake | 2 ++
.../{notenough1.cmake => combine.cmake} | 2 +-
.../CTestResourceAllocation/notenough1.cmake | 2 +-
.../CTestResourceAllocation/notenough2.cmake | 2 +-
...ck.cmake => notenough3-ctest-s-res-check.cmake} | 0
.../notenough3-ctest-s-res-result.txt} | 0
.../notenough3-ctest-s-res-stderr.txt | 4 ++++
.../{notenough2.cmake => notenough3.cmake} | 2 +-
.../RunCMake/CTestResourceAllocation/resspec.json | 4 ++++
47 files changed, 242 insertions(+), 11 deletions(-)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec19.json}
(56%)
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec20.json
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec21.json}
(50%)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec22.json}
(56%)
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec23.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec24.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec25.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec26.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec27.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec28.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec29.json
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec30.json}
(53%)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec31.json}
(50%)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec32.json}
(50%)
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec33.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec34.json
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec35.json}
(53%)
copy Tests/RunCMake/CTestResourceAllocation/{notenough1.cmake =>
combine.cmake} (50%)
copy
Tests/RunCMake/CTestResourceAllocation/{notenough1-ctest-s-res-check.cmake =>
notenough3-ctest-s-res-check.cmake} (100%)
copy Tests/RunCMake/{CTestCommandExpandLists/expandEmptyCommand-result.txt =>
CTestResourceAllocation/notenough3-ctest-s-res-result.txt} (100%)
create mode 100644
Tests/RunCMake/CTestResourceAllocation/notenough3-ctest-s-res-stderr.txt
copy Tests/RunCMake/CTestResourceAllocation/{notenough2.cmake =>
notenough3.cmake} (53%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
