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 12bd36c..0a53fb4 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -346,8 +346,7 @@ NYC_VULKAN_PKG                                      = Package(module = VULKAN_MODULE, configurations = [
 MASTER_EGL_COMMON_FILTERS              = [include("egl-master.txt"),
                                                                   exclude("egl-test-issues.txt"),
                                                                   exclude("egl-internal-api-tests.txt"),
-                                                                  exclude("egl-manual-robustness.txt"),
-                                                                  exclude("egl-temporary-exclusions.txt")]
+                                                                  exclude("egl-manual-robustness.txt")]
 MASTER_EGL_PKG                                 = Package(module = EGL_MODULE, configurations = [
                # Master
                Configuration(name                      = "master",
@@ -380,8 +379,7 @@ MASTER_GLES3_COMMON_FILTERS         = [
                exclude("gles3-hw-issues.txt"),
                exclude("gles3-driver-issues.txt"),
                exclude("gles3-test-issues.txt"),
-               exclude("gles3-spec-issues.txt"),
-               exclude("gles3-temporary-exclusions.txt")
+               exclude("gles3-spec-issues.txt")
        ]
 MASTER_GLES3_PKG                               = Package(module = GLES3_MODULE, configurations = [
                # Master
@@ -502,7 +500,7 @@ MASTER_VULKAN_FILTERS                       = [
                exclude("vk-not-applicable.txt"),
                exclude("vk-excluded-tests.txt"),
                exclude("vk-test-issues.txt"),
-               exclude("vk-temporary-exclusions.txt")
+               exclude("vk-waivers.txt")
        ]
 MASTER_VULKAN_PKG                              = Package(module = VULKAN_MODULE, configurations = [
                Configuration(name                      = "master",