diff options
| author | bcwhite@chromium.org <bcwhite@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 19:59:04 +0000 |
|---|---|---|
| committer | bcwhite@chromium.org <bcwhite@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 19:59:04 +0000 |
| commit | 062b726a86046abb2b1c3efa55f34850ba6d0e51 (patch) | |
| tree | e414258758a0e28b71017d0e0c85060643418870 /content/content_unittests.isolate | |
| parent | b1ad3c5435d33dc863bc97ac1adac369aaab3819 (diff) | |
| download | chromium_src-062b726a86046abb2b1c3efa55f34850ba6d0e51.zip chromium_src-062b726a86046abb2b1c3efa55f34850ba6d0e51.tar.gz chromium_src-062b726a86046abb2b1c3efa55f34850ba6d0e51.tar.bz2 | |
Add "isolate" for content_unittests.
BUG=
Review URL: https://codereview.chromium.org/27714002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_unittests.isolate')
| -rw-r--r-- | content/content_unittests.isolate | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index b39101c..780aefb 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -12,13 +12,24 @@ ], }, }], - ['OS=="android" or OS=="mac"', { + ['OS=="android" or OS=="mac" or OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/content_resources.pak', ], }, }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'isolate_dependency_tracked': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_untracked': [ + '../tools/swarm_client/', + ], + }, + }], ['OS=="linux"', { 'variables': { 'command': [ @@ -28,42 +39,33 @@ '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ + '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', - ], - 'isolate_dependency_untracked': [ - '<(PRODUCT_DIR)/test_data/', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ + 'command': [ + '../testing/test_env.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '../tools/swarm_client/', - ], - }, - }], - ['OS=="mac"', { - 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, }], - ['OS=="mac" or OS=="win"', { + ['OS=="win"', { 'variables': { 'command': [ '../testing/test_env.py', '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], - }, - }], - ['OS=="win"', { - 'variables': { 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/aura_test_support_resources.pak', '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/icudt.dll', ], |