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

Side by Side Diff: base/base_unittests.isolate

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 | « base/base_nacl.gyp ('k') | base/files/file_path_watcher_win.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 ], 10 ],
11 }, 11 },
12 }], 12 }],
13 ['OS=="linux"', { 13 ['OS=="linux"', {
14 'variables': { 14 'variables': {
15 'command': [ 15 'command': [
16 '../testing/xvfb.py', 16 '../testing/xvfb.py',
17 '<(PRODUCT_DIR)', 17 '<(PRODUCT_DIR)',
18 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', 18 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
19 '--brave-new-test-launcher', 19 '--brave-new-test-launcher',
20 '--test-launcher-bot-mode', 20 '--test-launcher-bot-mode',
21 '--asan=<(asan)', 21 '--asan=<(asan)',
22 '--lsan=<(lsan)',
23 '--msan=<(msan)', 22 '--msan=<(msan)',
24 '--tsan=<(tsan)', 23 '--tsan=<(tsan)',
25 ], 24 ],
26 'files': [ 25 'files': [
27 '../testing/xvfb.py', 26 '../testing/xvfb.py',
28 ], 27 ],
29 }, 28 },
30 }], 29 }],
31 ['OS=="linux" and use_ozone==0', { 30 ['OS=="linux" and use_ozone==0', {
32 'variables': { 31 'variables': {
(...skipping 12 matching lines...) Expand all
45 }, 44 },
46 }], 45 }],
47 ['OS=="mac" or OS=="win"', { 46 ['OS=="mac" or OS=="win"', {
48 'variables': { 47 'variables': {
49 'command': [ 48 'command': [
50 '../testing/test_env.py', 49 '../testing/test_env.py',
51 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', 50 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
52 '--brave-new-test-launcher', 51 '--brave-new-test-launcher',
53 '--test-launcher-bot-mode', 52 '--test-launcher-bot-mode',
54 '--asan=<(asan)', 53 '--asan=<(asan)',
55 '--lsan=<(lsan)',
56 '--msan=<(msan)', 54 '--msan=<(msan)',
57 '--tsan=<(tsan)', 55 '--tsan=<(tsan)',
58 ], 56 ],
59 }, 57 },
60 }], 58 }],
61 ['OS=="mac" and asan==1 and fastbuild==0', { 59 ['OS=="mac" and asan==1 and fastbuild==0', {
62 'variables': { 60 'variables': {
63 'files': [ 61 'files': [
64 '<(PRODUCT_DIR)/base_unittests.dSYM/', 62 '<(PRODUCT_DIR)/base_unittests.dSYM/',
65 ], 63 ],
66 }, 64 },
67 }], 65 }],
68 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 66 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
69 'variables': { 67 'variables': {
70 'files': [ 68 'files': [
71 '<(PRODUCT_DIR)/base_unittests.exe.pdb', 69 '<(PRODUCT_DIR)/base_unittests.exe.pdb',
72 ], 70 ],
73 }, 71 },
74 }], 72 }],
75 ['OS=="win"', {
76 'variables': {
77 'files': [
78 '<(PRODUCT_DIR)/pe_image_test.dll',
79 ],
80 },
81 }],
82 ], 73 ],
83 'includes': [ 74 'includes': [
84 'base.isolate', 75 'base.isolate',
85 ], 76 ],
86 } 77 }
OLDNEW
« no previous file with comments | « base/base_nacl.gyp ('k') | base/files/file_path_watcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698