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

Unified Diff: components/components_unittests.isolate

Issue 862953002: Revert of Swarm components_unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « components/components_tests.gyp ('k') | testing/buildbot/chromium.linux.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components_unittests.isolate
diff --git a/components/components_unittests.isolate b/components/components_unittests.isolate
index da4e0e694e16f36e73a9c5df26789a5c2d02aee9..f79939d1600ce26995d92d61039ff73a255b43c3 100644
--- a/components/components_unittests.isolate
+++ b/components/components_unittests.isolate
@@ -1,94 +1,26 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2013 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.
{
+ 'variables': {
+ 'files': [
+ 'test/data/',
+ ],
+ },
'conditions': [
- ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
- 'variables': {
- 'files': [
- 'test/data/',
- '<(PRODUCT_DIR)/resources.pak',
- ],
- },
- }],
- ['OS=="linux" or OS=="mac" or OS=="win"', {
- 'variables': {
- 'files': [
- '../testing/test_env.py',
- '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
- ],
- },
- }],
- ['OS=="android" or OS=="linux" or OS=="win"', {
+ ['OS=="android"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/chrome_100_percent.pak',
+ '<(PRODUCT_DIR)/content_resources.pak',
'<(PRODUCT_DIR)/locales/en-US.pak',
- ],
- },
- }],
- ['OS=="linux"', {
- 'variables': {
- 'command': [
- '../testing/xvfb.py',
- '<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/components_unittests',
- '--brave-new-test-launcher',
- '--test-launcher-bot-mode',
- '--asan=<(asan)',
- '--lsan=<(lsan)',
- ],
- 'files': [
- '../testing/xvfb.py',
- '<(PRODUCT_DIR)/libffmpegsumo.so',
- '<(PRODUCT_DIR)/libosmesa.so',
- '<(PRODUCT_DIR)/xdisplaycheck',
- ],
- },
- }],
- ['OS=="mac"', {
- 'variables': {
- 'command': [
- '../testing/test_env.py',
- '<(PRODUCT_DIR)/components_unittests',
- '--brave-new-test-launcher',
- '--test-launcher-bot-mode',
- '--asan=<(asan)',
- '--lsan=<(lsan)',
- ],
- 'files': [
- '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
- '<(PRODUCT_DIR)/ffmpegsumo.so',
- '<(PRODUCT_DIR)/osmesa.so',
- ],
- },
- }],
- ['OS=="win"', {
- 'variables': {
- 'command': [
- '../testing/test_env.py',
- '<(PRODUCT_DIR)/components_unittests.exe',
- '--brave-new-test-launcher',
- '--test-launcher-bot-mode',
- '--asan=<(asan)',
- '--lsan=<(lsan)',
- ],
- 'files': [
- '../chrome/test/data/policy/',
- '<(PRODUCT_DIR)/ffmpegsumo.dll',
- '<(PRODUCT_DIR)/osmesa.dll',
- ],
- },
- }],
- ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/components_unittests.exe.pdb',
+ '<(PRODUCT_DIR)/resources.pak',
],
},
}],
],
'includes': [
- '../base/base.isolate',
+ '../third_party/icu/icu.isolate',
+ '../gin/v8.isolate',
],
}
« no previous file with comments | « components/components_tests.gyp ('k') | testing/buildbot/chromium.linux.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698