Fix EGL test list split
Component: Android
Google bug: b/229087109
Change-Id: I1e7fd040742ef0c2dda48c9962f985ea4f517caa
diff --git a/android/cts/AndroidTest.xml b/android/cts/AndroidTest.xml
index 5c7c26a..19d929f 100644
--- a/android/cts/AndroidTest.xml
+++ b/android/cts/AndroidTest.xml
@@ -36,7 +36,7 @@
</object>
<test class="com.drawelements.deqp.runner.DeqpTestRunner">
<option name="deqp-package" value="dEQP-EGL"/>
- <option name="deqp-caselist-file" value="egl-master-2021-03-01.txt"/>
+ <option name="deqp-caselist-file" value="egl-master-2020-03-01.txt"/>
<option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
<option name="deqp-surface-type" value="window"/>
<option name="deqp-screen-rotation" value="unspecified"/>
diff --git a/android/cts/master/src/egl-master-2021-03-01.txt b/android/cts/master/egl-master-2020-03-01.txt
similarity index 100%
copy from android/cts/master/src/egl-master-2021-03-01.txt
copy to android/cts/master/egl-master-2020-03-01.txt
diff --git a/android/cts/master/mustpass.xml b/android/cts/master/mustpass.xml
index baea615..83d6649 100644
--- a/android/cts/master/mustpass.xml
+++ b/android/cts/master/mustpass.xml
@@ -20,7 +20,7 @@
-->
<TestPackage name="dEQP-EGL">
<Configuration caseListFile="egl-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
- <Configuration caseListFile="egl-master-2021-03-01.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master-2021-03-01"/>
+ <Configuration caseListFile="egl-master-2020-03-01.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master-2020-03-01"/>
<Configuration caseListFile="egl-master-2022-03-01.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master-2022-03-01"/>
<Configuration caseListFile="egl-master-risky.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master-risky"/>
</TestPackage>
diff --git a/android/cts/master/src/egl-master-2021-03-01.txt b/android/cts/master/src/egl-master-2020-03-01.txt
similarity index 100%
rename from android/cts/master/src/egl-master-2021-03-01.txt
rename to android/cts/master/src/egl-master-2020-03-01.txt
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 796bec2..71718c5 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -70,19 +70,19 @@
filters = MASTER_EGL_COMMON_FILTERS,
runtime = "23m",
runByDefault = False),
- Configuration(name = "master-2021-03-01",
+ Configuration(name = "master-2020-03-01",
glconfig = "rgba8888d24s8ms0",
rotation = "unspecified",
surfacetype = "window",
required = True,
- filters = [include("egl-master-2021-03-01.txt")],
+ filters = [include("egl-master-2020-03-01.txt")],
runtime = "23m"),
Configuration(name = "master-2022-03-01",
glconfig = "rgba8888d24s8ms0",
rotation = "unspecified",
surfacetype = "window",
required = True,
- filters = MASTER_EGL_COMMON_FILTERS + [exclude("egl-master-2021-03-01.txt")],
+ filters = MASTER_EGL_COMMON_FILTERS + [exclude("egl-master-2020-03-01.txt")],
runtime = "5m"),
# Risky subset
Configuration(name = "master-risky",
