Chromium Code Reviews| Index: components/components_browsertests.isolate |
| diff --git a/base/base_unittests.isolate b/components/components_browsertests.isolate |
| similarity index 61% |
| copy from base/base_unittests.isolate |
| copy to components/components_browsertests.isolate |
| index f561d209cf5920b95b36562e9edc01f0db678469..16892408e064aed219902716634eb6005cf32bd8 100644 |
| --- a/base/base_unittests.isolate |
| +++ b/components/components_browsertests.isolate |
| @@ -1,12 +1,26 @@ |
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +# Copyright 2015 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| { |
| + 'includes': [ |
| + '../base/base.isolate', |
| + '../gin/v8.isolate', |
|
jam
2015/01/22 16:42:56
you sure you need this?
nyquist
2015/01/22 22:47:33
Yes, otherwise the tests would fail with no visibl
|
| + ], |
| 'conditions': [ |
| - ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { |
| + ['OS=="linux" or OS=="mac" or OS=="win"', { |
| 'variables': { |
| 'files': [ |
| 'test/data/', |
| + '../media/test/data/', |
| + '../net/data/', |
|
jam
2015/01/22 16:42:56
just to be clear, these two directories are needed
nyquist
2015/01/22 22:47:33
Apparently not. Removed a few more.
|
| + '../net/tools/testserver/', |
| + '../testing/test_env.py', |
| + '../third_party/pyftpdlib/', |
| + '../third_party/pywebsocket/', |
| + '../third_party/tlslite/', |
| + '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/components_resources.pak', |
| + '<(PRODUCT_DIR)/content_shell.pak', |
|
jam
2015/01/22 16:42:55
do you know what is using this pak file? it's stra
nyquist
2015/01/22 22:47:33
The test DistillerPageWebContentsTest.TestTitleAnd
jam
2015/01/23 17:35:07
I see, ok.
|
| ], |
| }, |
| }], |
| @@ -15,7 +29,7 @@ |
| 'command': [ |
| '../testing/xvfb.py', |
| '<(PRODUCT_DIR)', |
| - '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/components_browsertests', |
| '--brave-new-test-launcher', |
| '--test-launcher-bot-mode', |
| '--asan=<(asan)', |
| @@ -23,6 +37,7 @@ |
| ], |
| 'files': [ |
| '../testing/xvfb.py', |
| + '<(PRODUCT_DIR)/libosmesa.so', |
| ], |
| }, |
| }], |
| @@ -33,20 +48,11 @@ |
| ], |
| }, |
| }], |
| - ['OS=="linux" or OS=="mac" or OS=="win"', { |
| - 'variables': { |
| - 'files': [ |
| - '../testing/test_env.py', |
| - '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', |
| - ], |
| - 'read_only': 1, |
| - }, |
| - }], |
| ['OS=="mac" or OS=="win"', { |
| 'variables': { |
| 'command': [ |
| '../testing/test_env.py', |
| - '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', |
| '--brave-new-test-launcher', |
| '--test-launcher-bot-mode', |
| '--asan=<(asan)', |
| @@ -54,15 +60,12 @@ |
| ], |
| }, |
| }], |
| - ['OS=="win" and (fastbuild==0 or fastbuild==1)', { |
| + ['OS=="mac"', { |
| 'variables': { |
| 'files': [ |
| - '<(PRODUCT_DIR)/base_unittests.exe.pdb', |
| + '<(PRODUCT_DIR)/Content Shell.app/', |
|
jam
2015/01/22 16:42:56
are you sure you need this?
nyquist
2015/01/22 22:47:33
I believe so, though I don't have a Mac. However,
|
| ], |
| }, |
| }], |
| ], |
| - 'includes': [ |
| - 'base.isolate', |
| - ], |
| } |