summaryrefslogtreecommitdiffstats
path: root/chrome/gl_tests.isolate
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 19:34:46 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 19:34:46 +0000
commiteb66d06bc0295f8ba67298feed2bffee9f89fcd2 (patch)
tree21cadeb78fcf808cb24aaed59f0a131a19ada565 /chrome/gl_tests.isolate
parente39bc28661717b73d7966913be7a9eec844f840e (diff)
downloadchromium_src-eb66d06bc0295f8ba67298feed2bffee9f89fcd2.zip
chromium_src-eb66d06bc0295f8ba67298feed2bffee9f89fcd2.tar.gz
chromium_src-eb66d06bc0295f8ba67298feed2bffee9f89fcd2.tar.bz2
Fixes to make GPU tests run in isolated mode.
1) To match the gyp dependencies, move clearkeycdmadapter binaries, plugins/, lib32/ and lib64/ from chrome.isolate to browser_tests.isolate. 2) On Windows, include <(version_full).manifest in chrome.isolate to be able to execute chrome.exe. Add needed chrome_child.dll and chrome_elf.dll. 3) Add libEGL.dll and libGLESv2.dll dependencies to gpu.gyp:gl_tests and a new angle.isolate; refer to it from gl_tests.isolate and gles2_conform_test.isolate. 4) Copy run_gpu_test to run_gpu_test.py, and invoke that instead in telemetry_gpu_test.isolate, to make this isolate work on Windows. BUG=321878,334539 Review URL: https://codereview.chromium.org/140263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gl_tests.isolate')
-rw-r--r--chrome/gl_tests.isolate3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/gl_tests.isolate b/chrome/gl_tests.isolate
index bd96664..1afc399 100644
--- a/chrome/gl_tests.isolate
+++ b/chrome/gl_tests.isolate
@@ -2,6 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
+ 'includes': [
+ 'angle.isolate',
+ ],
'conditions': [
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {