commit 3d698f2f1ea0c41f1f925490ea989f0d72c5ada9
author Pyry Haulos <phaulos@google.com> Tue Apr 14 13:52:46 2015 -0700
committer Pyry Haulos <phaulos@google.com> Tue Apr 14 15:31:32 2015 -0700
tree c37f9cae08b1b5a79262efe751c3e9988b503a73
parent 9192470c581f309a0a2d1b04218e7b171ccd4b79

Enable deqp ES2 and EGL tests

Change-Id: I80ea740c78973edc5e3776e73a70d1920f91ceef

CtsTestCaseList.mk

diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index f382227..61704a3 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -210,6 +210,8 @@
     CtsJdwp
 
 cts_deqp_test_apis := \
+    egl \
+    gles2 \
     gles3 \
     gles31
 

tests/tests/deqp/Android.mk

diff --git a/tests/tests/deqp/Android.mk b/tests/tests/deqp/Android.mk
index 242cb39..ce8678b 100644
--- a/tests/tests/deqp/Android.mk
+++ b/tests/tests/deqp/Android.mk
@@ -21,6 +21,7 @@
 # All APIs share the same package
 LOCAL_PACKAGE_NAME := com.drawelements.deqp
 
+include $(LOCAL_PATH)/deqp_egl.mk
 include $(LOCAL_PATH)/deqp_gles2.mk
 include $(LOCAL_PATH)/deqp_gles3.mk
 include $(LOCAL_PATH)/deqp_gles31.mk

tests/tests/deqp/deqp_egl.mk

diff --git a/tests/tests/deqp/deqp_egl.mk b/tests/tests/deqp/deqp_egl.mk
new file mode 100644
index 0000000..6b4eed6
--- /dev/null
+++ b/tests/tests/deqp/deqp_egl.mk
@@ -0,0 +1,21 @@
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Dummy target to make dEQP EGL test list generation consistent with other
+# tests.
+
+DEQP_API := egl
+DEQP_TEST_NAME := dEQP-EGL
+
+include $(BUILD_CTS_DEQP_PACKAGE)

tools/utils/buildCts.py

diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 31229b1..010453a 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -373,6 +373,8 @@
       'android.uiautomation' : [],
       'android.uirendering' : [],
       'android.webgl' : [],
+      'com.drawelements.deqp.egl' : [],
+      'com.drawelements.deqp.gles2' : [],
       'com.drawelements.deqp.gles3' : [],
       'com.drawelements.deqp.gles31' : []}