diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
| commit | 1e9bf3e0803691d0a228da41fc608347b6db4340 (patch) | |
| tree | ab2e5565f71b4219b3da406e19f16fe306704ef5 /chrome/browser_tests.isolate | |
| parent | f10b58d5bc6ae3e74076fc4ccca14cbc57ef805c (diff) | |
| download | chromium_org-1e9bf3e0803691d0a228da41fc608347b6db4340.tar.gz | |
Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
Diffstat (limited to 'chrome/browser_tests.isolate')
| -rw-r--r-- | chrome/browser_tests.isolate | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 40c98f678b..150f018e3e 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -8,13 +8,10 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/googletest/run_test_cases.py', - '--use-less-jobs', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', '<(PRODUCT_DIR)/libffmpegsumo.so', @@ -87,6 +84,7 @@ ['OS=="linux" or OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/locales/fr.pak', @@ -117,6 +115,7 @@ ], 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/Chromium Framework.framework/', + '<(PRODUCT_DIR)/Chromium Helper.app/', '<(PRODUCT_DIR)/Chromium.app/', '<(PRODUCT_DIR)/lib32/', '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/', @@ -128,8 +127,6 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/googletest/run_test_cases.py', - '--use-less-jobs', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', ], }, @@ -143,6 +140,7 @@ '<(PRODUCT_DIR)/D3DCompiler_43.dll', '<(PRODUCT_DIR)/clearkeycdm.dll', '<(PRODUCT_DIR)/clearkeycdmadapter.dll', + '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/icudt.dll', |