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

Unified Diff: ui/app_list/app_list_unittests.isolate

Issue 724603004: Isolate remaining tests under ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 6 years 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 | « ui/app_list/app_list.gyp ('k') | ui/base/ui_base_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_unittests.isolate
diff --git a/base/base_unittests.isolate b/ui/app_list/app_list_unittests.isolate
similarity index 62%
copy from base/base_unittests.isolate
copy to ui/app_list/app_list_unittests.isolate
index f561d209cf5920b95b36562e9edc01f0db678469..4ceb64ddba4915b5812df66618d54d161f3ddad1 100644
--- a/base/base_unittests.isolate
+++ b/ui/app_list/app_list_unittests.isolate
@@ -1,28 +1,31 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2014 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': [
- 'test/data/',
+ '../../testing/test_env.py',
+ '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/ui_test.pak',
],
},
}],
['OS=="linux"', {
'variables': {
'command': [
- '../testing/xvfb.py',
+ '../../testing/xvfb.py',
'<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
'files': [
- '../testing/xvfb.py',
+ '../../testing/xvfb.py',
+ '<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
@@ -33,20 +36,25 @@
],
},
}],
- ['OS=="linux" or OS=="mac" or OS=="win"', {
+ ['OS=="mac"', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/osmesa.so',
+ ],
+ },
+ }],
+ ['OS=="win"', {
'variables': {
'files': [
- '../testing/test_env.py',
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/osmesa.dll',
],
- 'read_only': 1,
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
- '../testing/test_env.py',
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+ '../../testing/test_env.py',
+ '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -54,15 +62,8 @@
],
},
}],
- ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/base_unittests.exe.pdb',
- ],
- },
- }],
],
'includes': [
- 'base.isolate',
+ '../../base/base.isolate',
],
}
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/base/ui_base_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698