From eb66d06bc0295f8ba67298feed2bffee9f89fcd2 Mon Sep 17 00:00:00 2001 From: "kbr@chromium.org" Date: Thu, 16 Jan 2014 19:34:46 +0000 Subject: 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 --- gpu/gpu.gyp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gpu') diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 3aeedfc1..a185ba5 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -335,6 +335,12 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], + ['OS == "win"', { + 'dependencies': [ + '../third_party/angle/src/build_angle.gyp:libEGL', + '../third_party/angle/src/build_angle.gyp:libGLESv2', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], -- cgit v1.1