Update ANGLE+dEQP integration.

This CL adds the EGL test target, as well as updates the Chromium
integration with dEQP to match the ANGLE-side CL. The isolates
no longer bundle in case lists with gzip files, but instead pull
the test cases directly from the dEQP Android CTS must pass list.

BUG=angleproject:1236

Review URL: https://codereview.chromium.org/1479323002

Cr-Commit-Position: refs/heads/master@{#362227}

4 files changed, 54 insertions, 5 deletions

diff --git a/chrome/angle_deqp_egl_tests.isolate b/chrome/angle_deqp_egl_tests.isolate
new file mode 100644
index 0000000..8b59ef3
--- /dev/null
+++ b/chrome/angle_deqp_egl_tests.isolate
@@ -0,0 +1,39 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# TOOD(jmadill): disable gtest batching
+{
+  'includes': [
+    '../base/base.isolate',
+    '../third_party/angle/angle_on_all_platforms.isolate',
+  ],
+  'conditions': [
+    ['OS=="win" or OS=="linux"', {
+      'variables': {
+        'command': [
+          '<(PRODUCT_DIR)/angle_deqp_egl_tests<(EXECUTABLE_SUFFIX)',
+          '--test-launcher-batch-limit=400',
+        ],
+        'files': [
+          '../third_party/angle/src/tests/deqp_support/deqp_egl_test_expectations.txt',
+          '../third_party/deqp/src/android/cts/master/egl-master.txt',
+          '../third_party/deqp/src/data/',
+        ],
+      },
+    }],
+    ['OS=="win"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/angle_deqp_libegl.dll',
+        ],
+      },
+    }],
+    ['OS=="linux"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/lib/libangle_deqp_libegl.so',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/chrome/angle_deqp_gles2_tests.isolate b/chrome/angle_deqp_gles2_tests.isolate
index caa4edf..e213cbf 100644
--- a/chrome/angle_deqp_gles2_tests.isolate
+++ b/chrome/angle_deqp_gles2_tests.isolate
@@ -15,8 +15,8 @@
           '--test-launcher-batch-limit=400',
         ],
         'files': [
-          '<(PRODUCT_DIR)/deqp_support/deqp_gles2_test_expectations.txt',
-          '<(PRODUCT_DIR)/deqp_support/dEQP-GLES2-cases.txt.gz',
+          '../third_party/angle/src/tests/deqp_support/deqp_gles2_test_expectations.txt',
+          '../third_party/deqp/src/android/cts/master/gles2-master.txt',
           '../third_party/deqp/src/data/',
         ],
       },
diff --git a/chrome/angle_deqp_gles3_tests.isolate b/chrome/angle_deqp_gles3_tests.isolate
index 4aac5ea..54fc21f 100644
--- a/chrome/angle_deqp_gles3_tests.isolate
+++ b/chrome/angle_deqp_gles3_tests.isolate
@@ -15,9 +15,8 @@
           '--test-launcher-batch-limit=400',
         ],
         'files': [
-          '<(PRODUCT_DIR)/angle_deqp_gles3_tests<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/deqp_support/deqp_gles3_test_expectations.txt',
-          '<(PRODUCT_DIR)/deqp_support/dEQP-GLES3-cases.txt.gz',
+          '../third_party/angle/src/tests/deqp_support/deqp_gles3_test_expectations.txt',
+          '../third_party/deqp/src/android/cts/master/gles3-master.txt',
           '../third_party/deqp/src/data/',
         ],
       },
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index df56152..5ff50cc 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3491,6 +3491,17 @@
                     'angle_deqp_gles3_tests.isolate',
                   ],
                 },
+                {
+                  'target_name': 'angle_deqp_egl_tests_run',
+                  'type': 'none',
+                  'dependencies': [
+                    '../gpu/gpu.gyp:angle_deqp_egl_tests',
+                    'gpu_tests_base',
+                  ],
+                  'sources': [
+                    'angle_deqp_egl_tests.isolate',
+                  ],
+                },
               ],
             }],
           ],