Merge vk-gl-cts/vulkan-cts-1.0.0 into vk-gl-cts/vulkan-cts-1.0.1

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / build_mustpass.py

diff --git a/external/vulkancts/build_mustpass.py b/external/vulkancts/build_mustpass.py
index 8f2720c..4ed46b8 100644 (file)
--- a/external/vulkancts/build_mustpass.py
+++ b/external/vulkancts/build_mustpass.py
@@ -6,24 +6,17 @@
 #
 # Copyright (c) 2016 Google Inc.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and/or associated documentation files (the
-# "Materials"), to deal in the Materials without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Materials, and to
-# permit persons to whom the Materials are furnished to do so, subject to
-# the following conditions:
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# The above copyright notice(s) and this permission notice shall be
-# included in all copies or substantial portions of the Materials.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 #-------------------------------------------------------------------------
 
@@ -38,25 +31,18 @@ from build_caselists import Module, getModuleByName, getBuildConfig, DEFAULT_BUI
 from mustpass import Project, Package, Mustpass, Configuration, include, exclude, genMustpassLists
 
 COPYRIGHT_DECLARATION = """
-     Permission is hereby granted, free of charge, to any person obtaining a
-     copy of this software and/or associated documentation files (the
-     "Materials"), to deal in the Materials without restriction, including
-     without limitation the rights to use, copy, modify, merge, publish,
-     distribute, sublicense, and/or sell copies of the Materials, and to
-     permit persons to whom the Materials are furnished to do so, subject to
-     the following conditions:
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
 
-     The above copyright notice(s) and this permission notice shall be
-     included in all copies or substantial portions of the Materials.
+                 http://www.apache.org/licenses/LICENSE-2.0
 
-     THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-     MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-     """
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+        """
 
 MUSTPASS_PATH          = os.path.join(DEQP_DIR, "external", "vulkancts", "mustpass")
 PROJECT                                = Project(path = MUSTPASS_PATH, copyright = COPYRIGHT_DECLARATION)
@@ -66,15 +52,25 @@ BUILD_CONFIG                = getBuildConfig(DEFAULT_BUILD_DIR, DEFAULT_TARGET, "Debug")
 # 1.0.0
 
 VULKAN_1_0_0_PKG       = Package(module = VULKAN_MODULE, configurations = [
-               # Master
-               Configuration(name              = "default",
-                                         filters       = [include("master.txt"),
-                                                                  exclude("test-issues.txt"),
-                                                                  exclude("excluded-tests.txt")]),
-       ])
+                 # Master
+                 Configuration(name            = "default",
+                                               filters         = [include("master.txt")]),
+        ])
+
+# 1.0.1
+
+VULKAN_1_0_1_PKG       = Package(module = VULKAN_MODULE, configurations = [
+                 # Master
+                 Configuration(name            = "default",
+                                               filters         = [include("master.txt"),
+                                                                          exclude("test-issues.txt"),
+                                                                          exclude("excluded-tests.txt"),
+                                                                          exclude("waivers.txt")]),
+        ])
 
 MUSTPASS_LISTS         = [
-               Mustpass(project = PROJECT, version = "1.0.0",          packages = [VULKAN_1_0_0_PKG])
+                 Mustpass(project = PROJECT,   version = "1.0.0",      packages = [VULKAN_1_0_0_PKG]),
+                 Mustpass(project = PROJECT,   version = "1.0.1",      packages = [VULKAN_1_0_1_PKG]),
        ]
 
 if __name__ == "__main__":