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

Side by Side Diff: base/base_unittests.isolate

Issue 599863003: Fix ChromeOS Ozone build since it doesn't have xdisplaycheck. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | build/android/pylib/gtest/setup.py » ('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 'isolate_dependency_untracked': [ 8 'isolate_dependency_untracked': [
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 ], 21 ],
22 'isolate_dependency_tracked': [ 22 'isolate_dependency_tracked': [
23 '../testing/xvfb.py', 23 '../testing/xvfb.py',
24 ],
25 },
26 }],
27 ['OS=="linux" and use_ozone==0', {
28 'variables': {
29 'isolate_dependency_tracked': [
24 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 30 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
25 ], 31 ],
26 }, 32 },
27 }], 33 }],
28 ['OS=="linux" or OS=="mac" or OS=="win"', { 34 ['OS=="linux" or OS=="mac" or OS=="win"', {
29 'variables': { 35 'variables': {
30 'isolate_dependency_tracked': [ 36 'isolate_dependency_tracked': [
31 '../testing/test_env.py', 37 '../testing/test_env.py',
32 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', 38 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
33 ], 39 ],
(...skipping 15 matching lines...) Expand all
49 'isolate_dependency_untracked': [ 55 'isolate_dependency_untracked': [
50 '<(PRODUCT_DIR)/base_unittests.exe.pdb', 56 '<(PRODUCT_DIR)/base_unittests.exe.pdb',
51 ], 57 ],
52 }, 58 },
53 }], 59 }],
54 ], 60 ],
55 'includes': [ 61 'includes': [
56 'base.isolate', 62 'base.isolate',
57 ], 63 ],
58 } 64 }
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/gtest/setup.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698