diff options
author | Paul Thomson <paulthomson@google.com> | 2021-10-25 12:16:03 +0100 |
---|---|---|
committer | Paul Thomson <paulthomson@google.com> | 2021-10-27 14:00:09 +0000 |
commit | bc45a54d096965a4ce648f82d878079fc14be090 (patch) | |
tree | 727f7dcdcc75803d50bb8d3aa2924ce8060507b8 | |
parent | c91f112f29c8093b49ca2f18aabdc157bab27dbd (diff) | |
download | deqp-android12-qpr3-s1-release.tar.gz |
Update codegen for no_foldable_statesandroid-vts-12.1_r2android-cts-12.1_r2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
Update mustpass.py to output no_foldable_states annotation.
Also, re-gen Android must pass files.
Bug: b/204043474
Change-Id: I625d8ebc72b9c7dddd1080c0ca2f0da37d0cbd2b
-rw-r--r-- | android/cts/AndroidTest.xml | 2 | ||||
-rw-r--r-- | scripts/mustpass.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/android/cts/AndroidTest.xml b/android/cts/AndroidTest.xml index 9233af6e4..2bacc4af8 100644 --- a/android/cts/AndroidTest.xml +++ b/android/cts/AndroidTest.xml @@ -27,7 +27,7 @@ <option key="parameter" name="config-descriptor:metadata" value="not_instant_app"/> <option key="parameter" name="config-descriptor:metadata" value="multi_abi"/> <option key="parameter" name="config-descriptor:metadata" value="secondary_user"/> - <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" /> + <option key="parameter" name="config-descriptor:metadata" value="no_foldable_states"/> <object class="com.android.tradefed.testtype.suite.module.TestFailureModuleController" type="module_controller"> <option name="screenshot-on-failure" value="false"/> </object> diff --git a/scripts/mustpass.py b/scripts/mustpass.py index 8c4ae98c4..4d1e2b454 100644 --- a/scripts/mustpass.py +++ b/scripts/mustpass.py @@ -318,6 +318,7 @@ def genAndroidTestXml (mustpass): ElementTree.SubElement(configElement, "option", key="parameter", name="config-descriptor:metadata", value="not_instant_app") ElementTree.SubElement(configElement, "option", key="parameter", name="config-descriptor:metadata", value="multi_abi") ElementTree.SubElement(configElement, "option", key="parameter", name="config-descriptor:metadata", value="secondary_user") + ElementTree.SubElement(configElement, "option", key="parameter", name="config-descriptor:metadata", value="no_foldable_states") controllerElement = ElementTree.SubElement(configElement, "object") controllerElement.set("class", "com.android.tradefed.testtype.suite.module.TestFailureModuleController") controllerElement.set("type", "module_controller") |