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

Side by Side Diff: chrome/unit_tests.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 | « chrome/sync_integration_tests.isolate ('k') | content/content_browsertests.isolate » ('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"', { 6 ['OS=="android" or OS=="linux"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_untracked': [ 8 'isolate_dependency_untracked': [
9 '<(PRODUCT_DIR)/test_data/', 9 '<(PRODUCT_DIR)/test_data/',
10 ], 10 ],
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 '<(PRODUCT_DIR)', 44 '<(PRODUCT_DIR)',
45 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', 45 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
46 '--brave-new-test-launcher', 46 '--brave-new-test-launcher',
47 '--test-launcher-bot-mode', 47 '--test-launcher-bot-mode',
48 ], 48 ],
49 'isolate_dependency_tracked': [ 49 'isolate_dependency_tracked': [
50 '../testing/xvfb.py', 50 '../testing/xvfb.py',
51 '<(PRODUCT_DIR)/libffmpegsumo.so', 51 '<(PRODUCT_DIR)/libffmpegsumo.so',
52 '<(PRODUCT_DIR)/libosmesa.so', 52 '<(PRODUCT_DIR)/libosmesa.so',
53 '<(PRODUCT_DIR)/locales/fr.pak', 53 '<(PRODUCT_DIR)/locales/fr.pak',
54 ],
55 },
56 }],
57 ['OS=="linux" and use_ozone==0', {
58 'variables': {
59 'isolate_dependency_tracked': [
54 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 60 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
55 ], 61 ],
56 }, 62 },
57 }], 63 }],
58 ['OS=="linux" or OS=="mac" or OS=="win"', { 64 ['OS=="linux" or OS=="mac" or OS=="win"', {
59 'variables': { 65 'variables': {
60 'isolate_dependency_tracked': [ 66 'isolate_dependency_tracked': [
61 '../testing/test_env.py', 67 '../testing/test_env.py',
62 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', 68 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
63 ], 69 ],
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 'isolate_dependency_untracked': [ 139 'isolate_dependency_untracked': [
134 '../chromeos/test/data/network/', 140 '../chromeos/test/data/network/',
135 ], 141 ],
136 }, 142 },
137 }], 143 }],
138 ], 144 ],
139 'includes': [ 145 'includes': [
140 '../base/base.isolate', 146 '../base/base.isolate',
141 ], 147 ],
142 } 148 }
OLDNEW
« no previous file with comments | « chrome/sync_integration_tests.isolate ('k') | content/content_browsertests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698