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

Side by Side Diff: chrome/sync_integration_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/interactive_ui_tests.isolate ('k') | chrome/unit_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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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=="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)/sync_integration_tests<(EXECUTABLE_SUFFIX)', 11 '<(PRODUCT_DIR)/sync_integration_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/test_env.py', 15 '../testing/test_env.py',
16 '../testing/xvfb.py', 16 '../testing/xvfb.py',
17 '<(PRODUCT_DIR)/libffmpegsumo.so', 17 '<(PRODUCT_DIR)/libffmpegsumo.so',
18 '<(PRODUCT_DIR)/libosmesa.so', 18 '<(PRODUCT_DIR)/libosmesa.so',
19 ],
20 },
21 }],
22 ['OS=="linux" and use_ozone==0', {
23 'variables': {
24 'isolate_dependency_tracked': [
19 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 25 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
20 ], 26 ],
21 }, 27 },
22 }], 28 }],
23 ['OS=="linux" or OS=="win"', { 29 ['OS=="linux" or OS=="win"', {
24 'variables': { 30 'variables': {
25 'isolate_dependency_tracked': [ 31 'isolate_dependency_tracked': [
26 '<(PRODUCT_DIR)/chrome_100_percent.pak', 32 '<(PRODUCT_DIR)/chrome_100_percent.pak',
27 '<(PRODUCT_DIR)/locales/en-US.pak', 33 '<(PRODUCT_DIR)/locales/en-US.pak',
28 ], 34 ],
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 'isolate_dependency_tracked': [ 90 'isolate_dependency_tracked': [
85 '<(PRODUCT_DIR)/libexif.so', 91 '<(PRODUCT_DIR)/libexif.so',
86 ], 92 ],
87 }, 93 },
88 }], 94 }],
89 ], 95 ],
90 'includes': [ 96 'includes': [
91 '../third_party/icu/icu.isolate', 97 '../third_party/icu/icu.isolate',
92 ], 98 ],
93 } 99 }
OLDNEW
« no previous file with comments | « chrome/interactive_ui_tests.isolate ('k') | chrome/unit_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698