Index: extensions/extensions_browsertests.isolate |
diff --git a/components/components_browsertests.isolate b/extensions/extensions_browsertests.isolate |
similarity index 74% |
copy from components/components_browsertests.isolate |
copy to extensions/extensions_browsertests.isolate |
index cb5b41c6f1f0a2d8ba50776d94f4212784122ae9..6ba54bdf6f4fa639953fe8995ee0ad1a5c6af462 100644 |
--- a/components/components_browsertests.isolate |
+++ b/extensions/extensions_browsertests.isolate |
@@ -2,28 +2,13 @@ |
# 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', |
- ], |
'conditions': [ |
- ['OS=="linux" or OS=="mac" or OS=="win"', { |
- 'variables': { |
- 'files': [ |
- 'test/data/', |
- '../testing/test_env.py', |
- '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', |
- '<(PRODUCT_DIR)/components_resources.pak', |
- '<(PRODUCT_DIR)/content_shell.pak', |
- ], |
- }, |
- }], |
['OS=="linux"', { |
'variables': { |
'command': [ |
'../testing/xvfb.py', |
'<(PRODUCT_DIR)', |
- '<(PRODUCT_DIR)/components_browsertests', |
+ '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', |
'--brave-new-test-launcher', |
'--test-launcher-bot-mode', |
'--asan=<(asan)', |
@@ -46,7 +31,7 @@ |
'variables': { |
'command': [ |
'../testing/test_env.py', |
- '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', |
'--brave-new-test-launcher', |
'--test-launcher-bot-mode', |
'--asan=<(asan)', |
@@ -54,12 +39,24 @@ |
], |
}, |
}], |
- ['OS=="mac"', { |
+ ['OS=="linux" or OS=="mac" or OS=="win"', { |
M-A Ruel
2015/01/24 00:03:07
FYI, I generally prefer the conditions to be sorte
scottmg
2015/01/24 00:24:55
Better?
M-A Ruel
2015/01/24 00:37:37
Yes.
|
'variables': { |
'files': [ |
- '<(PRODUCT_DIR)/Content Shell.app/', |
+ '../net/data/', |
+ '../net/tools/testserver/', |
+ '../testing/test_env.py', |
+ '../third_party/pyftpdlib/', |
+ '../third_party/pywebsocket/', |
+ '../third_party/tlslite/', |
+ '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/extensions_shell_and_test.pak', |
+ 'test/data/', |
], |
}, |
}], |
], |
+ 'includes': [ |
+ '../base/base.isolate', |
+ '../gin/v8.isolate', |
+ ], |
} |