Fix opengl native test list generation.
Use a static list of tests for the native opengl tests.
Bug: 13287945
Change-Id: I44196aedf4b1c4a91a9d24aee268b812f0d0d800
diff --git a/build/test_gtest_package.mk b/build/test_gtest_package.mk
index 6ecd798..cbd9414 100644
--- a/build/test_gtest_package.mk
+++ b/build/test_gtest_package.mk
@@ -27,6 +27,7 @@
cts_package_apk := $(CTS_TESTCASES_OUT)/$(LOCAL_PACKAGE_NAME).apk
cts_package_xml := $(CTS_TESTCASES_OUT)/$(LOCAL_PACKAGE_NAME).xml
+cts_test_list := $(LOCAL_PATH)/$(LOCAL_MODULE)_list.txt
$(cts_package_apk): PRIVATE_PACKAGE := $(LOCAL_PACKAGE_NAME)
$(cts_package_apk): $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/package.apk | $(ACP)
@@ -37,13 +38,14 @@
$(cts_package_xml): PRIVATE_TEST_PACKAGE := android.$(notdir $(LOCAL_PATH))
$(cts_package_xml): PRIVATE_EXECUTABLE := $(LOCAL_MODULE)
$(cts_package_xml): PRIVATE_MANIFEST := $(LOCAL_PATH)/AndroidManifest.xml
-$(cts_package_xml): $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES)) $(CTS_NATIVE_TEST_SCANNER) $(CTS_XML_GENERATOR)
+$(cts_package_xml): PRIVATE_TEST_LIST := $(cts_test_list)
+$(cts_package_xml): $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES)) $(CTS_NATIVE_TEST_SCANNER) $(CTS_XML_GENERATOR) $(cts_test_list)
$(hide) echo Generating test description for wrapped native package $(PRIVATE_EXECUTABLE)
$(hide) mkdir -p $(CTS_TESTCASES_OUT)
- $(hide) $(CTS_NATIVE_TEST_SCANNER) -s $(PRIVATE_PATH) \
- -t $(PRIVATE_TEST_PACKAGE) | \
+ $(hide) cat $(PRIVATE_TEST_LIST) | \
+ $(CTS_NATIVE_TEST_SCANNER) -t $(PRIVATE_TEST_PACKAGE) | \
$(CTS_XML_GENERATOR) -t wrappednative \
- -m $(PRIVATE_MANIFEST) \
+ -m $(PRIVATE_MANIFEST) \
-n $(PRIVATE_EXECUTABLE) \
-p $(PRIVATE_TEST_PACKAGE) \
-e $(CTS_EXPECTATIONS) \
diff --git a/tests/tests/nativeopengl/CtsNativeOpenGLTestCases_list.txt b/tests/tests/nativeopengl/CtsNativeOpenGLTestCases_list.txt
new file mode 100644
index 0000000..8daf3b2
--- /dev/null
+++ b/tests/tests/nativeopengl/CtsNativeOpenGLTestCases_list.txt
@@ -0,0 +1,6 @@
+EGLCleanupTest.
+ TestCorrect
+EGLCreateContextTest.
+ BadAttributeFails
+GLTest.
+ ClearColorTest
