fix DEQP AndroidTest.xml generation script

Bug: 36140955
Bug: 35360169
Test: ran scripts/build_android_mustpass.py to regnerate
Change-Id: I8ecfdad5d8a17d46dc0ed9f860a75086158ffd64

diff --git a/android/cts/AndroidTest.xml b/android/cts/AndroidTest.xml
index 60e1229ccfc33bee0957d2132c3f97459641107c..a880b85a358dd529dbd69ef12410fb9734bbbe46 100644 (file)
--- a/android/cts/AndroidTest.xml
+++ b/android/cts/AndroidTest.xml
@@ -18,7 +18,7 @@
        <!--
      This file has been automatically generated. Edit with caution.
      -->
-       <option name="config-descriptor:metadata" key="component" value="deqp" />
+       <option key="component" name="config-descriptor:metadata" value="deqp"/>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-EGL"/>
                <option name="deqp-caselist-file" value="egl-master.txt"/>

diff --git a/scripts/mustpass.py b/scripts/mustpass.py
index 5d4a92c9ef237e6537ad5bffec1676aecf71204a..5d5b8045cf08a2816021efe02d7c3b327a438c52 100644 (file)
--- a/scripts/mustpass.py
+++ b/scripts/mustpass.py
@@ -305,6 +305,9 @@ def genAndroidTestXml (mustpass):
        RUNNER_CLASS = "com.drawelements.deqp.runner.DeqpTestRunner"
        configElement = ElementTree.Element("configuration")
 
+       # add in metadata option for component name
+       ElementTree.SubElement(configElement, "option", name="config-descriptor:metadata", key="component", value="deqp")
+
        for package in mustpass.packages:
                for config in package.configurations:
                        testElement = ElementTree.SubElement(configElement, "test")