Run GTF EGL tests only in 'window' configs
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 Mar 2017 14:03:17 +0000 (15:03 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 Mar 2017 14:03:17 +0000 (15:03 +0100)
Affects:
GTF-GLES2.gtf.GL2ExtensionTests.egl*

Components: OpenGL

VL-GL-CTS issue: 258

Change-Id: I2d0c71e41b52965d5b41c7148dea94bb0bbd69e3

external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles2-gtf-egl.txt [new file with mode: 0644]
external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles2-gtf-master.txt
external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/mustpass.xml
external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles2-gtf-egl.txt [new file with mode: 0644]
external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles2-gtf-master.txt
external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles2-gtf-egl.txt [new file with mode: 0644]
external/openglcts/data/mustpass/gles/khronos_mustpass/master/mustpass.xml
external/openglcts/data/mustpass/gles/khronos_mustpass/master/src/gles2-gtf-egl.txt [new file with mode: 0644]
external/openglcts/modules/runner/glcKhronosMustpassEs.hpp
external/openglcts/scripts/build_mustpass.py

diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles2-gtf-egl.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles2-gtf-egl.txt
new file mode 100644 (file)
index 0000000..55aebee
--- /dev/null
@@ -0,0 +1,16 @@
+GTF-GLES2.gtf.GL2ExtensionTests.egl_create_context.egl_create_context
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image.egl_image
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetBinding
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImageUnits
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImage2D
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestFilterMode
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestMipmap
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestShaderExtension
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetActiveUniform
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureValid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureInvalid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureSupported
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimpleUnassociated
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimple
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShaderBad
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShader
index e629493..b168c0d 100644 (file)
@@ -971,22 +971,6 @@ GTF-GLES2.gtf.GL2ExtensionTests.depth_texture.depth_texture
 GTF-GLES2.gtf.GL2ExtensionTests.depth_texture_cube_map.depth_texture_cube_map
 GTF-GLES2.gtf.GL2ExtensionTests.dFdx.dFdx_frag
 GTF-GLES2.gtf.GL2ExtensionTests.dFdy.dFdy_frag
-GTF-GLES2.gtf.GL2ExtensionTests.egl_create_context.egl_create_context
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image.egl_image
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetBinding
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImageUnits
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImage2D
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestFilterMode
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestMipmap
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestShaderExtension
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetActiveUniform
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureValid
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureInvalid
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureSupported
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimpleUnassociated
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimple
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShaderBad
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShader
 GTF-GLES2.gtf.GL2ExtensionTests.fwidth.fwidth_frag_dx
 GTF-GLES2.gtf.GL2ExtensionTests.fwidth.fwidth_frag_dy
 GTF-GLES2.gtf.GL2ExtensionTests.fwidth.fwidth_frag
index 3a2339a..bab55f0 100644 (file)
@@ -23,6 +23,8 @@
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="True"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=-1 --deqp-base-seed=3 --deqp-gl-config-name=rgba8888d24s8 --deqp-surface-type=fbo --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="True"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=-1 --deqp-surface-height=64 --deqp-base-seed=3 --deqp-gl-config-name=rgba8888d24s8 --deqp-surface-type=fbo --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="True"/>
+               <Configuration caseListFile="gles2-gtf-egl.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="gtf-egl" os="any" useForFirstEGLConfig="True"/>
+               <Configuration caseListFile="gles2-gtf-egl.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="gtf-egl" os="any" useForFirstEGLConfig="True"/>
                <Configuration caseListFile="gles2-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="False"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="False"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="False"/>
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles2-gtf-egl.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles2-gtf-egl.txt
new file mode 100644 (file)
index 0000000..55aebee
--- /dev/null
@@ -0,0 +1,16 @@
+GTF-GLES2.gtf.GL2ExtensionTests.egl_create_context.egl_create_context
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image.egl_image
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetBinding
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImageUnits
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImage2D
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestFilterMode
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestMipmap
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestShaderExtension
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetActiveUniform
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureValid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureInvalid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureSupported
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimpleUnassociated
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimple
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShaderBad
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShader
index e629493..b168c0d 100644 (file)
@@ -971,22 +971,6 @@ GTF-GLES2.gtf.GL2ExtensionTests.depth_texture.depth_texture
 GTF-GLES2.gtf.GL2ExtensionTests.depth_texture_cube_map.depth_texture_cube_map
 GTF-GLES2.gtf.GL2ExtensionTests.dFdx.dFdx_frag
 GTF-GLES2.gtf.GL2ExtensionTests.dFdy.dFdy_frag
-GTF-GLES2.gtf.GL2ExtensionTests.egl_create_context.egl_create_context
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image.egl_image
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetBinding
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImageUnits
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImage2D
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestFilterMode
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestMipmap
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestShaderExtension
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetActiveUniform
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureValid
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureInvalid
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureSupported
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimpleUnassociated
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimple
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShaderBad
-GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShader
 GTF-GLES2.gtf.GL2ExtensionTests.fwidth.fwidth_frag_dx
 GTF-GLES2.gtf.GL2ExtensionTests.fwidth.fwidth_frag_dy
 GTF-GLES2.gtf.GL2ExtensionTests.fwidth.fwidth_frag
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles2-gtf-egl.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles2-gtf-egl.txt
new file mode 100644 (file)
index 0000000..55aebee
--- /dev/null
@@ -0,0 +1,16 @@
+GTF-GLES2.gtf.GL2ExtensionTests.egl_create_context.egl_create_context
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image.egl_image
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetBinding
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImageUnits
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImage2D
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestFilterMode
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestMipmap
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestShaderExtension
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetActiveUniform
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureValid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureInvalid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureSupported
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimpleUnassociated
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimple
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShaderBad
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShader
index fd1d093..c803726 100644 (file)
@@ -23,6 +23,8 @@
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="True"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=-1 --deqp-base-seed=3 --deqp-gl-config-name=rgba8888d24s8 --deqp-surface-type=fbo --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="True"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=-1 --deqp-surface-height=64 --deqp-base-seed=3 --deqp-gl-config-name=rgba8888d24s8 --deqp-surface-type=fbo --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="True"/>
+               <Configuration caseListFile="gles2-gtf-egl.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="gtf-egl" os="any" useForFirstEGLConfig="True"/>
+               <Configuration caseListFile="gles2-gtf-egl.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="gtf-egl" os="any" useForFirstEGLConfig="True"/>
                <Configuration caseListFile="gles2-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="False"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="False"/>
                <Configuration caseListFile="gles2-gtf-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="gtf-master" os="any" useForFirstEGLConfig="False"/>
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/src/gles2-gtf-egl.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/src/gles2-gtf-egl.txt
new file mode 100644 (file)
index 0000000..55aebee
--- /dev/null
@@ -0,0 +1,16 @@
+GTF-GLES2.gtf.GL2ExtensionTests.egl_create_context.egl_create_context
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image.egl_image
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetBinding
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImageUnits
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestImage2D
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestFilterMode
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestMipmap
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestShaderExtension
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestGetActiveUniform
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureValid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureInvalid
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestTargetTextureSupported
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimpleUnassociated
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestSimple
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShaderBad
+GTF-GLES2.gtf.GL2ExtensionTests.egl_image_external.TestVertexShader
index 5533f26..442ddc6 100644 (file)
@@ -39,6 +39,8 @@ static const RunParams khronos_mustpass_es_first_cfg[] = {
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", 64, -1 },
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", -1, 64 },
+       { glu::ApiType::es(2, 0), "gtf-egl", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+       { glu::ApiType::es(2, 0), "gtf-egl", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
        { glu::ApiType::es(3, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
index 54fb91f..ef74334 100644 (file)
@@ -708,33 +708,6 @@ GLCTS_GLES32_KHR_PKG_N1CFG                 = Package(module = ES32KHR_MODULE, useforfirsteglco
                                        filters                 = [include("gles32-khr-master.txt")]),
        ])
 
-GLCTS_3_2_3_GLES2_GTF_PKG_1CFG                 = Package(module = ES2GTF_MODULE, configurations = [
-               # Master
-               Configuration(name                      = "gtf-master",
-                                       surfacewidth    = "64",
-                                       surfaceheight   = "64",
-                                       baseseed                = "1",
-                                       filters                 = [include("gles2-gtf-master.txt")]),
-               Configuration(name                      = "gtf-master",
-                                       surfacewidth    = "113",
-                                       surfaceheight   = "47",
-                                       baseseed                = "2",
-                                       filters                 = [include("gles2-gtf-master.txt")]),
-               Configuration(name                      = "gtf-master",
-                                       surfacewidth    = "64",
-                                       surfaceheight   = "-1",
-                                       baseseed                = "3",
-                                       fboconfig               = "rgba8888d24s8",
-                                       filters                 = [include("gles2-gtf-master.txt")]),
-               Configuration(name                      = "gtf-master",
-                                       surfacewidth    = "-1",
-                                       surfaceheight   = "64",
-                                       baseseed                = "3",
-                                       fboconfig               = "rgba8888d24s8",
-                                       filters                 = [include("gles2-gtf-master.txt")]),
-       ])
-
-
 MUSTPASS_LISTS                         = [
        # 3.2.2.x
        Mustpass(project = CTS_KHR_MP_ES_PROJECT,       version = "3.2.2.x", isCurrent=False,
@@ -766,7 +739,7 @@ MUSTPASS_LISTS                              = [
        # 3.2.3.x
        Mustpass(project = CTS_KHR_MP_ES_PROJECT,       version = "3.2.3.x", isCurrent=True,
                        packages = [GLCTS_GLES2_KHR_PKG_1CFG,
-                                               GLCTS_3_2_3_GLES2_GTF_PKG_1CFG,
+                                               GLCTS_GLES2_GTF_PKG_1CFG,
                                                GLCTS_GLES2_KHR_PKG_N1CFG,
                                                GLCTS_GLES2_GTF_PKG_N1CFG,
                                                GLCTS_GLES3_KHR_PKG_1CFG,
@@ -790,7 +763,7 @@ MUSTPASS_LISTS                              = [
 
        Mustpass(project = CTS_KHR_MP_ES_PROJECT,       version = "master", isCurrent=False,
                        packages = [GLCTS_GLES2_KHR_PKG_1CFG,
-                                               GLCTS_3_2_3_GLES2_GTF_PKG_1CFG,
+                                               GLCTS_GLES2_GTF_PKG_1CFG,
                                                GLCTS_GLES2_KHR_PKG_N1CFG,
                                                GLCTS_GLES2_GTF_PKG_N1CFG,
                                                GLCTS_GLES3_KHR_PKG_1CFG,