From abcc59a7658ef4625047508a63ff1d489150c21f Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Thu, 22 Oct 2020 12:50:23 +0200 Subject: [PATCH] Amend Vulkan Conformance Submission Package Requirements The current practice is that all bugfixes should be merged into the CTS repo before being used in a submission. This change promotes this practices to a requirement. Compontents: Vulkan Change-Id: I61eef5522aecf97a3d42c49777681eb671affe87 --- external/vulkancts/README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/external/vulkancts/README.md b/external/vulkancts/README.md index 34d1f3e28..3783e601e 100644 --- a/external/vulkancts/README.md +++ b/external/vulkancts/README.md @@ -230,10 +230,15 @@ as part of the submission package (3). This can be done by running: git format-patch -o ..HEAD -In general, bugfixes and changes to platform-specific code (mostly under -`framework/platform`) are allowed. The commit message for each change must -include a clear description of the change and why it is necessary. Non-porting -related changes must be accompanied by a waiver (see below). +Changes to platform-specific code (mostly under `framework/platform`) +are allowed. The commit message for each change must include a clear +description of the change and why it is necessary. + +Bugfixes to the tests are allowed. Before being used for a submission, +bugfixes must be accepted and merged into the CTS repository. +`git cherry-pick` is strongly recommended as a method of applying bug fixes. + +Other changes must be accompanied by a waiver (see below). NOTE: When cherry-picking patches on top of release tag, please use `git cherry-pick -x` to include original commit hash in the commit message. -- 2.34.1