diff options
author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:43:55 +0000 |
---|---|---|
committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:43:55 +0000 |
commit | bc63a8ecee1ab18fceb0f32304b5d3740dffe10c (patch) | |
tree | f1fbc36bbbe5e96ba4eadfd6e37ead8840f94eb0 /content/content_browsertests.isolate | |
parent | 7bea7357129c4564382f0967ff331a2da3b21f52 (diff) | |
download | chromium_src-bc63a8ecee1ab18fceb0f32304b5d3740dffe10c.zip chromium_src-bc63a8ecee1ab18fceb0f32304b5d3740dffe10c.tar.gz chromium_src-bc63a8ecee1ab18fceb0f32304b5d3740dffe10c.tar.bz2 |
[Android] Convert more test targets to use isolate.
BUG=249870
TBR=ben@chromium.org, acolwell@chromium.org, joi@chromium.org, enne@chromium.org, mark@chromium.org, jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19040002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browsertests.isolate')
-rw-r--r-- | content/content_browsertests.isolate | 78 |
1 files changed, 49 insertions, 29 deletions
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 2ed7523..4c31a24 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -2,22 +2,25 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - 'test/data/', - '../net/data/', - '../net/tools/testserver/', - '../third_party/lighttpd/', - '../third_party/pyftpdlib/', - '../third_party/pywebsocket/', - '../third_party/tlslite/', - '../third_party/WebKit/Tools/Scripts/', - ], - }, 'conditions': [ + ['OS=="android"', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', + ], + 'isolate_dependency_untracked': [ + '../third_party/webgl_conformance/', + ], + }, + }], + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'isolate_dependency_untracked': [ + '../net/data/', + 'test/data/', + ], + }, + }], ['OS=="linux"', { 'variables': { 'command': [ @@ -32,29 +35,46 @@ '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so', '<(PRODUCT_DIR)/plugins/libTestNetscapePlugin.so', + '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so', ], }, }], - ['OS=="mac" or OS=="win"', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], + 'isolate_dependency_untracked': [ + '../net/tools/testserver/', + '../third_party/WebKit/Tools/Scripts/', + '../third_party/lighttpd/', + '../third_party/pyftpdlib/', + '../third_party/pywebsocket/', + '../third_party/tlslite/', + ], }, }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_untracked': [ + 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', '<(PRODUCT_DIR)/content_resources.pak', - '<(PRODUCT_DIR)/Content Shell.app/', '<(PRODUCT_DIR)/ffmpegsumo.so', - '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin', '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin', + '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin', + ], + 'isolate_dependency_untracked': [ + '<(PRODUCT_DIR)/Content Shell.app/', + ], + }, + }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '../tools/swarm_client/run_test_cases.py', + '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], }, }], @@ -62,6 +82,12 @@ 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', + '<(PRODUCT_DIR)/chrome_100_percent.pak', + '<(PRODUCT_DIR)/clearkeycdm.dll', + '<(PRODUCT_DIR)/clearkeycdmadapter.dll', + '<(PRODUCT_DIR)/content_shell.pak', + '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll', + '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', ], 'isolate_dependency_untracked': [ # The two directories below are only needed for @@ -69,12 +95,6 @@ #'../third_party/cygwin/', #'../third_party/perl/perl/', '../third_party/python_26/', - '<(PRODUCT_DIR)/chrome_100_percent.pak', - '<(PRODUCT_DIR)/clearkeycdm.dll', - '<(PRODUCT_DIR)/clearkeycdmadapter.dll', - '<(PRODUCT_DIR)/content_shell.pak', - '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', - '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll', ], }, }], |