diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 19:34:46 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 19:34:46 +0000 |
| commit | eb66d06bc0295f8ba67298feed2bffee9f89fcd2 (patch) | |
| tree | 21cadeb78fcf808cb24aaed59f0a131a19ada565 /chrome/chrome.isolate | |
| parent | e39bc28661717b73d7966913be7a9eec844f840e (diff) | |
| download | chromium_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/chrome.isolate')
| -rw-r--r-- | chrome/chrome.isolate | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index cc09a26..6a92211 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -6,8 +6,6 @@ ['OS=="linux"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/libclearkeycdm.so', - '<(PRODUCT_DIR)/libclearkeycdmadapter.so', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', @@ -36,8 +34,6 @@ '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', ], 'isolate_dependency_untracked': [ - '<(PRODUCT_DIR)/lib64/', - '<(PRODUCT_DIR)/plugins/', '<(PRODUCT_DIR)/resources/extension/', ], }, @@ -48,25 +44,23 @@ '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_name)', ], 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', '<(PRODUCT_DIR)/ffmpegsumo.so', - '<(PRODUCT_DIR)/libclearkeycdm.dylib', ], 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/', '<(PRODUCT_DIR)/<(mac_product_name).app/', - '<(PRODUCT_DIR)/lib32/', ], }, }], ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/<(version_full).manifest', '<(PRODUCT_DIR)/D3DCompiler_43.dll', '<(PRODUCT_DIR)/chrome.dll', - '<(PRODUCT_DIR)/clearkeycdm.dll', - '<(PRODUCT_DIR)/clearkeycdmadapter.dll', + '<(PRODUCT_DIR)/chrome_child.dll', + '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/libEGL.dll', |