Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev
[platform/upstream/VK-GL-CTS.git] / scripts / build_android_mustpass.py
index 4139e10..dae0b99 100644 (file)
@@ -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
 
@@ -197,11 +197,157 @@ MNC_GLES31_PKG                                   = Package(module = GLES31_MODULE, configurations = [
                                          filters               = [include("gles31-master.txt"), include("gles31-pixelformat.txt")]),
        ])
 
+# NYC
+
+NYC_EGL_COMMON_FILTERS                 = [include("egl-master.txt")]
+NYC_EGL_PKG                                            = Package(module = EGL_MODULE, configurations = [
+               # Master
+               Configuration(name                      = "master",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_EGL_COMMON_FILTERS,
+                                     runtime           = "11m"),
+       ])
+
+NYC_GLES2_COMMON_FILTERS                       = [
+               include("gles2-master.txt")
+       ]
+NYC_GLES2_PKG                                  = Package(module = GLES2_MODULE, configurations = [
+               # Master
+               Configuration(name                      = "master",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES2_COMMON_FILTERS,
+                                         runtime               = "30m"),
+       ])
+
+NYC_GLES3_COMMON_FILTERS               = [
+               include("gles3-master.txt")
+       ]
+NYC_GLES3_PKG                                  = Package(module = GLES3_MODULE, configurations = [
+               # Master
+               Configuration(name                      = "master",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES3_COMMON_FILTERS,
+                                         runtime               = "1h50min"),
+               # Rotations
+               Configuration(name                      = "rotate-portrait",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "0",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
+                                         runtime               = "5m"),
+               Configuration(name                      = "rotate-landscape",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "90",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
+                                         runtime               = "5m"),
+               Configuration(name                      = "rotate-reverse-portrait",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "180",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
+                                         runtime               = "5m"),
+               Configuration(name                      = "rotate-reverse-landscape",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "270",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
+                                         runtime               = "5m"),
+
+               # MSAA
+               Configuration(name                      = "multisample",
+                                         glconfig              = "rgba8888d24s8ms4",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-multisample.txt")],
+                                         runtime               = "10m"),
+
+               # Pixel format
+               Configuration(name                      = "565-no-depth-no-stencil",
+                                         glconfig              = "rgb565d0s0ms0",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt")],
+                                         runtime               = "10m"),
+       ])
+
+NYC_GLES31_COMMON_FILTERS              = [
+               include("gles31-master.txt")
+       ]
+NYC_GLES31_PKG                                 = Package(module = GLES31_MODULE, configurations = [
+               # Master
+               Configuration(name                      = "master",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES31_COMMON_FILTERS,
+                                         runtime               = "4h40m"),
+
+               # Rotations
+               Configuration(name                      = "rotate-portrait",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "0",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")],
+                                         runtime               = "1m30s"),
+               Configuration(name                      = "rotate-landscape",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "90",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")],
+                                         runtime               = "1m30s"),
+               Configuration(name                      = "rotate-reverse-portrait",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "180",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")],
+                                         runtime               = "1m30s"),
+               Configuration(name                      = "rotate-reverse-landscape",
+                                         glconfig              = "rgba8888d24s8ms0",
+                                         rotation              = "270",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")],
+                                         runtime               = "1m30s"),
+
+               # MSAA
+               Configuration(name                      = "multisample",
+                                         glconfig              = "rgba8888d24s8ms4",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES31_COMMON_FILTERS + [include("gles31-multisample.txt")],
+                                         runtime               = "2m"),
+
+               # Pixel format
+               Configuration(name                      = "565-no-depth-no-stencil",
+                                         glconfig              = "rgb565d0s0ms0",
+                                         rotation              = "unspecified",
+                                         surfacetype   = "window",
+                                         filters               = NYC_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")],
+                                         runtime               = "1m"),
+       ])
+
+NYC_VULKAN_FILTERS                             = [
+               include("vk-master.txt")
+       ]
+NYC_VULKAN_PKG                                 = Package(module = VULKAN_MODULE, configurations = [
+               Configuration(name                      = "master",
+                                         filters               = NYC_VULKAN_FILTERS,
+                                         runtime               = "1h11m"),
+       ])
+
 # Master
 
 MASTER_EGL_COMMON_FILTERS              = [include("egl-master.txt"),
                                                                   exclude("egl-test-issues.txt"),
-                                                                  exclude("egl-internal-api-tests.txt")]
+                                                                  exclude("egl-internal-api-tests.txt"),
+                                                                  exclude("egl-manual-robustness.txt"),
+                                                                  exclude("egl-driver-issues.txt")]
 MASTER_EGL_PKG                                 = Package(module = EGL_MODULE, configurations = [
                # Master
                Configuration(name                      = "master",
@@ -210,7 +356,7 @@ MASTER_EGL_PKG                                      = Package(module = EGL_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_EGL_COMMON_FILTERS,
-                                     runtime           = "24m"),
+                                     runtime           = "23m"),
        ])
 
 MASTER_GLES2_COMMON_FILTERS            = [
@@ -226,7 +372,7 @@ MASTER_GLES2_PKG                            = Package(module = GLES2_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_GLES2_COMMON_FILTERS,
-                                         runtime               = "40m"),
+                                         runtime               = "46m"),
        ])
 
 MASTER_GLES3_COMMON_FILTERS            = [
@@ -244,32 +390,32 @@ MASTER_GLES3_PKG                          = Package(module = GLES3_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_GLES3_COMMON_FILTERS,
-                                         runtime               = "1h15m"),
+                                         runtime               = "1h50m"),
                # Rotations
                Configuration(name                      = "rotate-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "0",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
                Configuration(name                      = "rotate-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "90",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
                Configuration(name                      = "rotate-reverse-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "180",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
                Configuration(name                      = "rotate-reverse-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "270",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
 
                # MSAA
                Configuration(name                      = "multisample",
@@ -278,7 +424,7 @@ MASTER_GLES3_PKG                            = Package(module = GLES3_MODULE, configurations = [
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-multisample.txt"),
                                                                                                                                         exclude("gles3-multisample-issues.txt")],
-                                         runtime               = "10m"),
+                                         runtime               = "1m"),
 
                # Pixel format
                Configuration(name                      = "565-no-depth-no-stencil",
@@ -287,7 +433,7 @@ MASTER_GLES3_PKG                            = Package(module = GLES3_MODULE, configurations = [
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt"),
                                                                                                                                         exclude("gles3-pixelformat-issues.txt")],
-                                         runtime               = "10m"),
+                                         runtime               = "1m"),
        ])
 
 MASTER_GLES31_COMMON_FILTERS   = [
@@ -295,7 +441,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
@@ -305,7 +451,7 @@ MASTER_GLES31_PKG                           = Package(module = GLES31_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_GLES31_COMMON_FILTERS,
-                                         runtime               = "7h30m"),
+                                         runtime               = "1h40m"),
 
                # Rotations
                Configuration(name                      = "rotate-portrait",
@@ -351,25 +497,25 @@ MASTER_GLES31_PKG                         = Package(module = GLES31_MODULE, configurations = [
        ])
 
 MASTER_VULKAN_FILTERS                  = [
-               include("vulkan-master.txt"),
-               exclude("vulkan-not-applicable.txt"),
-               exclude("vulkan-test-issues.txt"),
-               exclude("vulkan-hw-issues.txt")
+               include("vk-master.txt"),
+               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",
                                          filters               = MASTER_VULKAN_FILTERS,
-                                         runtime               = "3h45m"),
+                                         runtime               = "2h29m"),
        ])
 
 MUSTPASS_LISTS                         = [
                Mustpass(project = CTS_PROJECT, version = "lmp",                packages = [LMP_GLES3_PKG, LMP_GLES31_PKG]),
                Mustpass(project = CTS_PROJECT, version = "lmp-mr1",    packages = [LMP_MR1_GLES3_PKG, LMP_MR1_GLES31_PKG]),
                Mustpass(project = CTS_PROJECT, version = "mnc",                packages = [MNC_EGL_PKG, MNC_GLES2_PKG, MNC_GLES3_PKG, MNC_GLES31_PKG]),
+               Mustpass(project = CTS_PROJECT, version = "nyc",                packages = [NYC_EGL_PKG, NYC_GLES2_PKG, NYC_GLES3_PKG, NYC_GLES31_PKG, NYC_VULKAN_PKG]),
                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())