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

Side by Side Diff: testing/chromoting/chromoting_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 | « content/content_unittests.isolate ('k') | no next file » | 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) 2014 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2014 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 '../xvfb.py', 9 '../xvfb.py',
10 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
12 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', 12 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch',
13 '--run-manual', 13 '--run-manual',
14 '--ui-test-action-timeout=100000', 14 '--ui-test-action-timeout=100000',
15 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', 15 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp',
16 '--extension-name=Chromoting', 16 '--extension-name=Chromoting',
17 ], 17 ],
18 'isolate_dependency_tracked': [ 18 'isolate_dependency_tracked': [
19 '../xvfb.py', 19 '../xvfb.py',
20 '<(PRODUCT_DIR)/libffmpegsumo.so', 20 '<(PRODUCT_DIR)/libffmpegsumo.so',
21 '<(PRODUCT_DIR)/libosmesa.so', 21 '<(PRODUCT_DIR)/libosmesa.so',
22 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 22 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
23 ],
24 },
25 }],
26 ['OS=="linux" and use_ozone==0', {
27 'variables': {
28 'isolate_dependency_tracked': [
23 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
24 ], 30 ],
25 }, 31 },
26 }], 32 }],
27 ['OS=="linux" or OS=="mac" or OS=="win"', { 33 ['OS=="linux" or OS=="mac" or OS=="win"', {
28 'variables': { 34 'variables': {
29 'isolate_dependency_tracked': [ 35 'isolate_dependency_tracked': [
30 '../test_env.py', 36 '../test_env.py',
31 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 37 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
32 '<(PRODUCT_DIR)/remoting/remoting.webapp/', 38 '<(PRODUCT_DIR)/remoting/remoting.webapp/',
(...skipping 21 matching lines...) Expand all
54 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', 60 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp',
55 '--extension-name=Chromoting', 61 '--extension-name=Chromoting',
56 ], 62 ],
57 }, 63 },
58 }], 64 }],
59 ], 65 ],
60 'includes': [ 66 'includes': [
61 '../../base/base.isolate', 67 '../../base/base.isolate',
62 ], 68 ],
63 } 69 }
OLDNEW
« no previous file with comments | « content/content_unittests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698