Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(965)

Unified Diff: extensions/extensions_browsertests.isolate

Issue 869783004: Isolate extensions_browsertests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add wow_helper for Vista x64 Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | extensions/extensions_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/extensions_browsertests.isolate
diff --git a/base/base_unittests.isolate b/extensions/extensions_browsertests.isolate
similarity index 62%
copy from base/base_unittests.isolate
copy to extensions/extensions_browsertests.isolate
index f561d209cf5920b95b36562e9edc01f0db678469..f0381c01c0c58d04e126389610f55591701841a5 100644
--- a/base/base_unittests.isolate
+++ b/extensions/extensions_browsertests.isolate
@@ -1,11 +1,19 @@
-# 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.
{
'conditions': [
- ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
+ '../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/',
],
},
@@ -15,7 +23,7 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -23,6 +31,7 @@
],
'files': [
'../testing/xvfb.py',
+ '<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
@@ -33,20 +42,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)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -54,15 +54,16 @@
],
},
}],
- ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ ['OS=="win" and target_arch=="ia32"', {
'variables': {
'files': [
- '<(PRODUCT_DIR)/base_unittests.exe.pdb',
+ '<(PRODUCT_DIR)/wow_helper.exe',
],
},
}],
],
'includes': [
- 'base.isolate',
+ '../base/base.isolate',
+ '../gin/v8.isolate',
],
}
« no previous file with comments | « no previous file | extensions/extensions_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698