Declare supported ABIs in dEQP test descriptors.
Add "abis" attribute to dEQP test case descriptor XMLs during the
CTS build by creating a dummy dEQP project under cts from which
the test descriptors depend on. Declaring supported ABIs prevents
dEQP tests from being run on an unsupported ABI.
Supported ABIs are queried by generating a test descriptor xml for
a dummy test list using the cts-xml-generator and then parsing the
result. The dEQP test descriptor XML templates are then patched
with the current ABIs.
Bug: 17956011
Change-Id: I3761c61d197523e0e9033dbe57e49e21ca2ad435
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index ce67d37..518de4b 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -199,6 +199,10 @@
cts_target_junit_tests := \
CtsJdwp
+cts_deqp_test_apis := \
+ gles3 \
+ gles31
+
# All the files that will end up under the repository/testcases
# directory of the final CTS distribution.
CTS_TEST_CASES := $(call cts-get-lib-paths,$(cts_host_libraries)) \
@@ -216,8 +220,7 @@
$(call cts-get-test-xmls,$(cts_native_exes)) \
$(call cts-get-test-xmls,$(cts_target_junit_tests)) \
$(call cts-get-test-xmls,$(cts_ui_tests)) \
- external/deqp/android/cts/com.drawelements.deqp.gles3.xml \
- external/deqp/android/cts/com.drawelements.deqp.gles31.xml
+ $(call cts-get-deqp-test-xmls,$(cts_deqp_test_apis))
# The following files will be placed in the tools directory of the CTS distribution
CTS_TOOLS_LIST :=