resolve merge conflicts of eb48f49dd to oc-dev

[platform/upstream/VK-GL-CTS.git] / scripts / build_android_mustpass.py

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 162ab3a..0a53fb4 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -23,7 +23,7 @@
 from build.common import DEQP_DIR
 from build.config import ANY_GENERATOR
 from build_caselists import Module, getModuleByName, getBuildConfig, DEFAULT_BUILD_DIR, DEFAULT_TARGET
-from mustpass import Project, Package, Mustpass, Configuration, include, exclude, genMustpassLists
+from mustpass import Project, Package, Mustpass, Configuration, include, exclude, genMustpassLists, parseBuildConfigFromCmdLineArgs
 
 import os
 
@@ -440,7 +440,7 @@ MASTER_GLES31_COMMON_FILTERS        = [
                exclude("gles31-hw-issues.txt"),
                exclude("gles31-driver-issues.txt"),
                exclude("gles31-test-issues.txt"),
-               exclude("gles31-spec-issues.txt"),
+               exclude("gles31-spec-issues.txt")
        ]
 MASTER_GLES31_PKG                              = Package(module = GLES31_MODULE, configurations = [
                # Master
@@ -500,6 +500,7 @@ MASTER_VULKAN_FILTERS                       = [
                exclude("vk-not-applicable.txt"),
                exclude("vk-excluded-tests.txt"),
                exclude("vk-test-issues.txt"),
+               exclude("vk-waivers.txt")
        ]
 MASTER_VULKAN_PKG                              = Package(module = VULKAN_MODULE, configurations = [
                Configuration(name                      = "master",
@@ -515,7 +516,5 @@ MUSTPASS_LISTS                              = [
                Mustpass(project = CTS_PROJECT, version = "master",             packages = [MASTER_EGL_PKG, MASTER_GLES2_PKG, MASTER_GLES3_PKG, MASTER_GLES31_PKG, MASTER_VULKAN_PKG])
        ]
 
-BUILD_CONFIG                           = getBuildConfig(DEFAULT_BUILD_DIR, DEFAULT_TARGET, "Debug")
-
 if __name__ == "__main__":
-       genMustpassLists(MUSTPASS_LISTS, ANY_GENERATOR, BUILD_CONFIG)
+       genMustpassLists(MUSTPASS_LISTS, ANY_GENERATOR, parseBuildConfigFromCmdLineArgs())