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

Side by Side Diff: components/components_unittests.isolate

Issue 867473002: Revert of Eliminate components_unittests' dependence on chrome resources. (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 unified diff | Download patch
« no previous file with comments | « components/components_tests.gyp ('k') | components/test/run_all_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 7 'variables': {
8 'files': [ 8 'files': [
9 'test/data/', 9 'test/data/',
10 '<(PRODUCT_DIR)/components_unittests_resources.pak', 10 '<(PRODUCT_DIR)/resources.pak',
11 ], 11 ],
12 }, 12 },
13 }], 13 }],
14 ['OS=="linux" or OS=="mac" or OS=="win"', { 14 ['OS=="linux" or OS=="mac" or OS=="win"', {
15 'variables': { 15 'variables': {
16 'files': [ 16 'files': [
17 '../testing/test_env.py', 17 '../testing/test_env.py',
18 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)', 18 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
19 ], 19 ],
20 }, 20 },
21 }], 21 }],
22 ['OS=="android" or OS=="linux" or OS=="win"', {
23 'variables': {
24 'files': [
25 '<(PRODUCT_DIR)/chrome_100_percent.pak',
26 '<(PRODUCT_DIR)/locales/en-US.pak',
27 ],
28 },
29 }],
22 ['OS=="linux"', { 30 ['OS=="linux"', {
23 'variables': { 31 'variables': {
24 'command': [ 32 'command': [
25 '../testing/xvfb.py', 33 '../testing/xvfb.py',
26 '<(PRODUCT_DIR)', 34 '<(PRODUCT_DIR)',
27 '<(PRODUCT_DIR)/components_unittests', 35 '<(PRODUCT_DIR)/components_unittests',
28 '--brave-new-test-launcher', 36 '--brave-new-test-launcher',
29 '--test-launcher-bot-mode', 37 '--test-launcher-bot-mode',
30 '--asan=<(asan)', 38 '--asan=<(asan)',
31 '--lsan=<(lsan)', 39 '--lsan=<(lsan)',
(...skipping 10 matching lines...) Expand all
42 'variables': { 50 'variables': {
43 'command': [ 51 'command': [
44 '../testing/test_env.py', 52 '../testing/test_env.py',
45 '<(PRODUCT_DIR)/components_unittests', 53 '<(PRODUCT_DIR)/components_unittests',
46 '--brave-new-test-launcher', 54 '--brave-new-test-launcher',
47 '--test-launcher-bot-mode', 55 '--test-launcher-bot-mode',
48 '--asan=<(asan)', 56 '--asan=<(asan)',
49 '--lsan=<(lsan)', 57 '--lsan=<(lsan)',
50 ], 58 ],
51 'files': [ 59 'files': [
60 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
52 '<(PRODUCT_DIR)/ffmpegsumo.so', 61 '<(PRODUCT_DIR)/ffmpegsumo.so',
53 '<(PRODUCT_DIR)/osmesa.so', 62 '<(PRODUCT_DIR)/osmesa.so',
54 ], 63 ],
55 }, 64 },
56 }], 65 }],
57 ['OS=="win"', { 66 ['OS=="win"', {
58 'variables': { 67 'variables': {
59 'command': [ 68 'command': [
60 '../testing/test_env.py', 69 '../testing/test_env.py',
61 '<(PRODUCT_DIR)/components_unittests.exe', 70 '<(PRODUCT_DIR)/components_unittests.exe',
(...skipping 14 matching lines...) Expand all
76 'files': [ 85 'files': [
77 '<(PRODUCT_DIR)/components_unittests.exe.pdb', 86 '<(PRODUCT_DIR)/components_unittests.exe.pdb',
78 ], 87 ],
79 }, 88 },
80 }], 89 }],
81 ], 90 ],
82 'includes': [ 91 'includes': [
83 '../base/base.isolate', 92 '../base/base.isolate',
84 ], 93 ],
85 } 94 }
OLDNEW
« no previous file with comments | « components/components_tests.gyp ('k') | components/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698