From: Guang Zhu <guangzhu@google.com>
Date: Tue, 6 Jun 2017 19:48:54 +0000 (-0700)
Subject: fix DEQP AndroidTest.xml generation script
X-Git-Tag: upstream/0.1.0^2^2^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a60033dd24a924338d7a567045f165442e6a17b0;p=platform%2Fupstream%2FVK-GL-CTS.git

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 60e1229cc..a880b85a3 100644
--- 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 5d4a92c9e..5d5b8045c 100644
--- 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")