Rename mnc mustpass to master

Change-Id: Ia165e88f371a506ca41227904e3e3f98b0b5bdee

diff --git a/android/cts/mnc/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
similarity index 100%
rename from android/cts/mnc/com.drawelements.deqp.gles3.xml
rename to android/cts/master/com.drawelements.deqp.gles3.xml

diff --git a/android/cts/mnc/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
similarity index 100%
rename from android/cts/mnc/com.drawelements.deqp.gles31.xml
rename to android/cts/master/com.drawelements.deqp.gles31.xml

diff --git a/android/cts/mnc/gles3-565-no-depth-no-stencil.txt b/android/cts/master/gles3-565-no-depth-no-stencil.txt
similarity index 100%
rename from android/cts/mnc/gles3-565-no-depth-no-stencil.txt
rename to android/cts/master/gles3-565-no-depth-no-stencil.txt

diff --git a/android/cts/mnc/gles3-master.txt b/android/cts/master/gles3-master.txt
similarity index 100%
rename from android/cts/mnc/gles3-master.txt
rename to android/cts/master/gles3-master.txt

diff --git a/android/cts/mnc/gles3-multisample.txt b/android/cts/master/gles3-multisample.txt
similarity index 100%
rename from android/cts/mnc/gles3-multisample.txt
rename to android/cts/master/gles3-multisample.txt

diff --git a/android/cts/mnc/gles3-rotate-landscape.txt b/android/cts/master/gles3-rotate-landscape.txt
similarity index 100%
rename from android/cts/mnc/gles3-rotate-landscape.txt
rename to android/cts/master/gles3-rotate-landscape.txt

diff --git a/android/cts/mnc/gles3-rotate-portrait.txt b/android/cts/master/gles3-rotate-portrait.txt
similarity index 100%
rename from android/cts/mnc/gles3-rotate-portrait.txt
rename to android/cts/master/gles3-rotate-portrait.txt

diff --git a/android/cts/mnc/gles3-rotate-reverse-landscape.txt b/android/cts/master/gles3-rotate-reverse-landscape.txt
similarity index 100%
rename from android/cts/mnc/gles3-rotate-reverse-landscape.txt
rename to android/cts/master/gles3-rotate-reverse-landscape.txt

diff --git a/android/cts/mnc/gles3-rotate-reverse-portrait.txt b/android/cts/master/gles3-rotate-reverse-portrait.txt
similarity index 100%
rename from android/cts/mnc/gles3-rotate-reverse-portrait.txt
rename to android/cts/master/gles3-rotate-reverse-portrait.txt

diff --git a/android/cts/mnc/gles31-565-no-depth-no-stencil.txt b/android/cts/master/gles31-565-no-depth-no-stencil.txt
similarity index 100%
rename from android/cts/mnc/gles31-565-no-depth-no-stencil.txt
rename to android/cts/master/gles31-565-no-depth-no-stencil.txt

diff --git a/android/cts/mnc/gles31-master.txt b/android/cts/master/gles31-master.txt
similarity index 100%
rename from android/cts/mnc/gles31-master.txt
rename to android/cts/master/gles31-master.txt

diff --git a/android/cts/mnc/gles31-multisample.txt b/android/cts/master/gles31-multisample.txt
similarity index 100%
rename from android/cts/mnc/gles31-multisample.txt
rename to android/cts/master/gles31-multisample.txt

diff --git a/android/cts/mnc/gles31-rotate-landscape.txt b/android/cts/master/gles31-rotate-landscape.txt
similarity index 100%
rename from android/cts/mnc/gles31-rotate-landscape.txt
rename to android/cts/master/gles31-rotate-landscape.txt

diff --git a/android/cts/mnc/gles31-rotate-portrait.txt b/android/cts/master/gles31-rotate-portrait.txt
similarity index 100%
rename from android/cts/mnc/gles31-rotate-portrait.txt
rename to android/cts/master/gles31-rotate-portrait.txt

diff --git a/android/cts/mnc/gles31-rotate-reverse-landscape.txt b/android/cts/master/gles31-rotate-reverse-landscape.txt
similarity index 100%
rename from android/cts/mnc/gles31-rotate-reverse-landscape.txt
rename to android/cts/master/gles31-rotate-reverse-landscape.txt

diff --git a/android/cts/mnc/gles31-rotate-reverse-portrait.txt b/android/cts/master/gles31-rotate-reverse-portrait.txt
similarity index 100%
rename from android/cts/mnc/gles31-rotate-reverse-portrait.txt
rename to android/cts/master/gles31-rotate-reverse-portrait.txt

diff --git a/android/cts/mnc/mustpass.xml b/android/cts/master/mustpass.xml
similarity index 99%
rename from android/cts/mnc/mustpass.xml
rename to android/cts/master/mustpass.xml
index e835db2..fca6b1d 100644 (file)
--- a/android/cts/mnc/mustpass.xml
+++ b/android/cts/master/mustpass.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Mustpass version="mnc">
+<Mustpass version="master">
        <TestPackage name="dEQP-GLES3">
                <Configuration caseListFile="gles3-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
                <Configuration caseListFile="gles3-rotate-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=0 --deqp-surface-type=window" name="rotate-portrait"/>

diff --git a/android/cts/mnc/src/gles3-hw-issues.txt b/android/cts/master/src/gles3-hw-issues.txt
similarity index 100%
rename from android/cts/mnc/src/gles3-hw-issues.txt
rename to android/cts/master/src/gles3-hw-issues.txt

diff --git a/android/cts/mnc/src/gles3-master.txt b/android/cts/master/src/gles3-master.txt
similarity index 100%
rename from android/cts/mnc/src/gles3-master.txt
rename to android/cts/master/src/gles3-master.txt

diff --git a/android/cts/mnc/src/gles3-multisample.txt b/android/cts/master/src/gles3-multisample.txt
similarity index 100%
rename from android/cts/mnc/src/gles3-multisample.txt
rename to android/cts/master/src/gles3-multisample.txt

diff --git a/android/cts/mnc/src/gles3-pixelformat.txt b/android/cts/master/src/gles3-pixelformat.txt
similarity index 100%
rename from android/cts/mnc/src/gles3-pixelformat.txt
rename to android/cts/master/src/gles3-pixelformat.txt

diff --git a/android/cts/mnc/src/gles3-rotation.txt b/android/cts/master/src/gles3-rotation.txt
similarity index 100%
rename from android/cts/mnc/src/gles3-rotation.txt
rename to android/cts/master/src/gles3-rotation.txt

diff --git a/android/cts/mnc/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt
similarity index 100%
rename from android/cts/mnc/src/gles3-test-issues.txt
rename to android/cts/master/src/gles3-test-issues.txt

diff --git a/android/cts/mnc/src/gles31-hw-issues.txt b/android/cts/master/src/gles31-hw-issues.txt
similarity index 100%
rename from android/cts/mnc/src/gles31-hw-issues.txt
rename to android/cts/master/src/gles31-hw-issues.txt

diff --git a/android/cts/mnc/src/gles31-master.txt b/android/cts/master/src/gles31-master.txt
similarity index 100%
rename from android/cts/mnc/src/gles31-master.txt
rename to android/cts/master/src/gles31-master.txt

diff --git a/android/cts/mnc/src/gles31-multisample.txt b/android/cts/master/src/gles31-multisample.txt
similarity index 100%
rename from android/cts/mnc/src/gles31-multisample.txt
rename to android/cts/master/src/gles31-multisample.txt

diff --git a/android/cts/mnc/src/gles31-pixelformat.txt b/android/cts/master/src/gles31-pixelformat.txt
similarity index 100%
rename from android/cts/mnc/src/gles31-pixelformat.txt
rename to android/cts/master/src/gles31-pixelformat.txt

diff --git a/android/cts/mnc/src/gles31-rotation.txt b/android/cts/master/src/gles31-rotation.txt
similarity index 100%
rename from android/cts/mnc/src/gles31-rotation.txt
rename to android/cts/master/src/gles31-rotation.txt

diff --git a/android/cts/mnc/src/gles31-test-issues.txt b/android/cts/master/src/gles31-test-issues.txt
similarity index 100%
rename from android/cts/mnc/src/gles31-test-issues.txt
rename to android/cts/master/src/gles31-test-issues.txt

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index f96fe35..995b185 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -405,101 +405,101 @@ LMP_MR1_GLES31_PKG                      = Package(module = GLES31_MODULE, configurations = [
                                          filters               = [include("es31-lmp-mr1.txt")]),
        ])
 
-MNC_GLES3_COMMON_FILTERS       = [include("gles3-master.txt"), exclude("gles3-hw-issues.txt"), exclude("gles3-test-issues.txt")]
-MNC_GLES3_PKG                          = Package(module = GLES3_MODULE, configurations = [
+MASTER_GLES3_COMMON_FILTERS    = [include("gles3-master.txt"), exclude("gles3-hw-issues.txt"), exclude("gles3-test-issues.txt")]
+MASTER_GLES3_PKG                               = Package(module = GLES3_MODULE, configurations = [
                # Master
                Configuration(name                      = "master",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES3_COMMON_FILTERS),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS),
                # Rotations
                Configuration(name                      = "rotate-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "0",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
                Configuration(name                      = "rotate-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "90",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
                Configuration(name                      = "rotate-reverse-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "180",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
                Configuration(name                      = "rotate-reverse-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "270",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")]),
 
                # MSAA
                Configuration(name                      = "multisample",
                                          glconfig              = "rgba8888d24s8ms4",
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES3_COMMON_FILTERS + [include("gles3-multisample.txt")]),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-multisample.txt")]),
 
                # Pixel format
                Configuration(name                      = "565-no-depth-no-stencil",
                                          glconfig              = "rgb565d0s0ms0",
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt")]),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt")]),
        ])
 
-MNC_GLES31_COMMON_FILTERS      = [include("gles31-master.txt"), exclude("gles31-hw-issues.txt"), exclude("gles31-test-issues.txt")]
-MNC_GLES31_PKG                         = Package(module = GLES31_MODULE, configurations = [
+MASTER_GLES31_COMMON_FILTERS   = [include("gles31-master.txt"), exclude("gles31-hw-issues.txt"), exclude("gles31-test-issues.txt")]
+MASTER_GLES31_PKG                              = Package(module = GLES31_MODULE, configurations = [
                # Master
                Configuration(name                      = "master",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES31_COMMON_FILTERS),
+                                         filters               = MASTER_GLES31_COMMON_FILTERS),
 
                # Rotations
                Configuration(name                      = "rotate-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "0",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+                                         filters               = MASTER_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
                Configuration(name                      = "rotate-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "90",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+                                         filters               = MASTER_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
                Configuration(name                      = "rotate-reverse-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "180",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+                                         filters               = MASTER_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
                Configuration(name                      = "rotate-reverse-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "270",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+                                         filters               = MASTER_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
 
                # MSAA
                Configuration(name                      = "multisample",
                                          glconfig              = "rgba8888d24s8ms4",
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES31_COMMON_FILTERS + [include("gles31-multisample.txt")]),
+                                         filters               = MASTER_GLES31_COMMON_FILTERS + [include("gles31-multisample.txt")]),
 
                # Pixel format
                Configuration(name                      = "565-no-depth-no-stencil",
                                          glconfig              = "rgb565d0s0ms0",
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
-                                         filters               = MNC_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")]),
+                                         filters               = MASTER_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")]),
        ])
 
 MUSTPASS_LISTS                         = [
                Mustpass(version = "lmp",               packages = [LMP_GLES3_PKG, LMP_GLES31_PKG]),
                Mustpass(version = "lmp-mr1",   packages = [LMP_MR1_GLES3_PKG, LMP_MR1_GLES31_PKG]),
-               Mustpass(version = "mnc",               packages = [MNC_GLES3_PKG, MNC_GLES31_PKG])
+               Mustpass(version = "master",    packages = [MASTER_GLES3_PKG, MASTER_GLES31_PKG])
        ]
 
 if __name__ == "__main__":