aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Thomson <paulthomson@google.com>2021-10-25 12:16:03 +0100
committerPaul Thomson <paulthomson@google.com>2021-10-27 14:00:09 +0000
commitbc45a54d096965a4ce648f82d878079fc14be090 (patch)
tree727f7dcdcc75803d50bb8d3aa2924ce8060507b8
parentc91f112f29c8093b49ca2f18aabdc157bab27dbd (diff)
downloaddeqp-android12-qpr3-s1-release.tar.gz
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.xml2
-rw-r--r--scripts/mustpass.py1
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")