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

Side by Side Diff: chrome/interactive_ui_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/browser_tests.isolate ('k') | chrome/sync_integration_tests.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/xvfb.py', 9 '../testing/xvfb.py',
10 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
11 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', 11 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
12 '--test-launcher-bot-mode', 12 '--test-launcher-bot-mode',
13 ], 13 ],
14 'isolate_dependency_tracked': [ 14 'isolate_dependency_tracked': [
15 '../testing/xvfb.py', 15 '../testing/xvfb.py',
16 '<(PRODUCT_DIR)/libffmpegsumo.so', 16 '<(PRODUCT_DIR)/libffmpegsumo.so',
17 '<(PRODUCT_DIR)/libosmesa.so', 17 '<(PRODUCT_DIR)/libosmesa.so',
18 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
19 ], 18 ],
20 'isolate_dependency_untracked': [ 19 'isolate_dependency_untracked': [
21 '<(PRODUCT_DIR)/pyproto/', 20 '<(PRODUCT_DIR)/pyproto/',
22 ], 21 ],
23 }, 22 },
24 }], 23 }],
24 ['OS=="linux" and use_ozone==0', {
25 'variables': {
26 'isolate_dependency_tracked': [
27 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
28 ],
29 },
30 }],
25 ['OS=="linux" or OS=="mac" or OS=="win"', { 31 ['OS=="linux" or OS=="mac" or OS=="win"', {
26 'variables': { 32 'variables': {
27 'isolate_dependency_tracked': [ 33 'isolate_dependency_tracked': [
28 '../testing/test_env.py', 34 '../testing/test_env.py',
29 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', 35 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
30 '<(PRODUCT_DIR)/resources.pak', 36 '<(PRODUCT_DIR)/resources.pak',
31 ], 37 ],
32 'isolate_dependency_untracked': [ 38 'isolate_dependency_untracked': [
33 '../net/data/ssl/certificates/', 39 '../net/data/ssl/certificates/',
34 '../net/tools/testserver/', 40 '../net/tools/testserver/',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 '../google_apis/test/', 109 '../google_apis/test/',
104 '<(PRODUCT_DIR)/resources/chromeos/', 110 '<(PRODUCT_DIR)/resources/chromeos/',
105 ], 111 ],
106 }, 112 },
107 }], 113 }],
108 ], 114 ],
109 'includes': [ 115 'includes': [
110 '../third_party/icu/icu.isolate', 116 '../third_party/icu/icu.isolate',
111 ], 117 ],
112 } 118 }
OLDNEW
« no previous file with comments | « chrome/browser_tests.isolate ('k') | chrome/sync_integration_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698