Retarget cts-runner to the master mustpass

Components: OpenGL

Affects: cts-runner

Change-Id: If9a68026a659006dd16d30a1d5ece7d8eb6e4153

diff --git a/external/openglcts/modules/runner/glcAospMustpassEgl.hpp b/external/openglcts/modules/runner/glcAospMustpassEgl.hpp
index b2304c1a441810620bbf5c19c5d417475fd7deb6..c1c9844649e6f83652a595e62e3593af786e3065 100644 (file)
--- a/external/openglcts/modules/runner/glcAospMustpassEgl.hpp
+++ b/external/openglcts/modules/runner/glcAospMustpassEgl.hpp
@@ -19,7 +19,7 @@
  * be lost! Modify the generating script instead.
  */
 
-const char* mustpassDir = "gl_cts/data/mustpass/egl/aosp_mustpass/3.2.5.x/";
+const char* mustpassDir = "gl_cts/data/mustpass/egl/aosp_mustpass/master/";
 
 static const RunParams aosp_mustpass_egl_first_cfg[] = {
        { glu::ApiType(), "master", "rgba8888d24s8ms0", "unspecified", -1, DE_NULL, 256, 256 },

diff --git a/external/openglcts/modules/runner/glcAospMustpassEs.hpp b/external/openglcts/modules/runner/glcAospMustpassEs.hpp
index 96145aa745dc5232086de1e64cb9f8ce21abd4d6..4c1f69c4c44a5fdb82d3b6334fe1082b447d80b7 100644 (file)
--- a/external/openglcts/modules/runner/glcAospMustpassEs.hpp
+++ b/external/openglcts/modules/runner/glcAospMustpassEs.hpp
@@ -19,7 +19,7 @@
  * be lost! Modify the generating script instead.
  */
 
-const char* mustpassDir = "gl_cts/data/mustpass/gles/aosp_mustpass/3.2.5.x/";
+const char* mustpassDir = "gl_cts/data/mustpass/gles/aosp_mustpass/master/";
 
 static const RunParams aosp_mustpass_es_first_cfg[] = {
        { glu::ApiType::es(2, 0), "master", "rgba8888d24s8ms0", "unspecified", -1, DE_NULL, 256, 256 },

diff --git a/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp b/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp
index 748e39954c90de9426b9db3e8c058a327c2f0546..ff0ffdb7d8ab2a9b190e342bb1077fe2f015d78f 100644 (file)
--- a/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp
+++ b/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp
@@ -19,7 +19,7 @@
  * be lost! Modify the generating script instead.
  */
 
-const char* mustpassDir = "gl_cts/data/mustpass/gles/khronos_mustpass/3.2.5.x/";
+const char* mustpassDir = "gl_cts/data/mustpass/gles/khronos_mustpass/master/";
 
 static const RunParams khronos_mustpass_es_first_cfg[] = {
        { glu::ApiType::es(2, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },

diff --git a/external/openglcts/modules/runner/glcKhronosMustpassEsNocontext.hpp b/external/openglcts/modules/runner/glcKhronosMustpassEsNocontext.hpp
index 1bd0fba601965f7adea2c1c26e2a7ac704cb7df1..803355c8f0adc4fa1dc009ff65520b91c7bca394 100644 (file)
--- a/external/openglcts/modules/runner/glcKhronosMustpassEsNocontext.hpp
+++ b/external/openglcts/modules/runner/glcKhronosMustpassEsNocontext.hpp
@@ -19,7 +19,7 @@
  * be lost! Modify the generating script instead.
  */
 
-const char* mustpassDir = "gl_cts/data/mustpass/gles/khronos_mustpass_noctx/3.2.5.x/";
+const char* mustpassDir = "gl_cts/data/mustpass/gles/khronos_mustpass_noctx/master/";
 
 static const RunParams khronos_mustpass_es_nocontext_first_cfg[] = {
        { glu::ApiType::es(2, 0), "khr-noctx-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },

diff --git a/external/openglcts/scripts/build_mustpass.py b/external/openglcts/scripts/build_mustpass.py
index 6c250a3b5614cdc743dafe24715dc4dacc69bec1..9e6883cf0c53b85665ab6887d2cdce8166213f5e 100644 (file)
--- a/external/openglcts/scripts/build_mustpass.py
+++ b/external/openglcts/scripts/build_mustpass.py
@@ -947,7 +947,7 @@ ES_MUSTPASS_LISTS           = [
 
        # 3.2.5.x
 
-       Mustpass(project = CTS_KHR_MP_ES_PROJECT,   version = "3.2.5.x", isCurrent=True,
+       Mustpass(project = CTS_KHR_MP_ES_PROJECT,   version = "3.2.5.x", isCurrent=False,
                        packages = [GLCTS_GLES2_KHR_PKG_1CFG,
                                                GLCTS_GLES2_KHR_PKG_N1CFG,
                                                GLCTS_GLES3_KHR_PKG_1CFG,
@@ -958,18 +958,18 @@ ES_MUSTPASS_LISTS         = [
                                                GLCTS_GLES32_KHR_PKG_N1CFG,
                                                ]),
 
-       Mustpass(project = CTS_KHR_MP_NOCTX_ES_PROJECT, version = "3.2.5.x", isCurrent=True,
+       Mustpass(project = CTS_KHR_MP_NOCTX_ES_PROJECT, version = "3.2.5.x", isCurrent=False,
                        packages = [GLCTS_NOCTX_ES2_KHR_PKG, GLCTS_NOCTX_ES32_KHR_PKG]),
 
-       Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "3.2.5.x", isCurrent=True,
+       Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "3.2.5.x", isCurrent=False,
                        packages = [GLCTS_3_2_3_GLES2_PKG, GLCTS_3_2_3_GLES3_PKG, GLCTS_3_2_3_GLES31_PKG]),
 
-       Mustpass(project = CTS_AOSP_MP_EGL_PROJECT, version = "3.2.5.x", isCurrent=True,
+       Mustpass(project = CTS_AOSP_MP_EGL_PROJECT, version = "3.2.5.x", isCurrent=False,
                        packages = [GLCTS_3_2_3_EGL_PKG]),
 
        # master
 
-       Mustpass(project = CTS_KHR_MP_ES_PROJECT,       version = "master", isCurrent=False,
+       Mustpass(project = CTS_KHR_MP_ES_PROJECT,       version = "master", isCurrent=True,
                        packages = [GLCTS_GLES2_KHR_PKG_1CFG,
                                                GLCTS_GLES2_KHR_PKG_N1CFG,
                                                GLCTS_GLES3_KHR_PKG_1CFG,
@@ -980,13 +980,13 @@ ES_MUSTPASS_LISTS         = [
                                                GLCTS_GLES32_KHR_PKG_N1CFG,
                                                ]),
 
-       Mustpass(project = CTS_KHR_MP_NOCTX_ES_PROJECT, version = "master", isCurrent=False,
+       Mustpass(project = CTS_KHR_MP_NOCTX_ES_PROJECT, version = "master", isCurrent=True,
                        packages = [GLCTS_NOCTX_ES2_KHR_PKG, GLCTS_NOCTX_ES32_KHR_PKG]),
 
-       Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "master", isCurrent=False,
+       Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "master", isCurrent=True,
                        packages = [MASTER_GLES2_PKG, MASTER_GLES3_PKG, MASTER_GLES31_PKG]),
 
-       Mustpass(project = CTS_AOSP_MP_EGL_PROJECT, version = "master", isCurrent=False,
+       Mustpass(project = CTS_AOSP_MP_EGL_PROJECT, version = "master", isCurrent=True,
                        packages = [MASTER_EGL_PKG])
 
        ]