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

Side by Side Diff: testing/chromoting/chromoting_integration_tests.isolate

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « testing/chromoting/browser_tests_launcher.py ('k') | testing/chromoting/integration_tests.gyp » ('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) 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 './browser_tests_launcher.py', 9 './browser_tests_launcher.py',
10 '-f', 10 '-f',
11 './browser_test_commands_linux.txt', 11 './browser_test_commands_linux.txt',
12 '-p', 12 '-p',
13 '<(PRODUCT_DIR)', 13 '<(PRODUCT_DIR)',
14 ], 14 ],
15 'files': [ 15 'files': [
16 '../xvfb.py', 16 '../xvfb.py',
17 './browser_tests_launcher.py', 17 './browser_tests_launcher.py',
18 './browser_test_commands_linux.txt', 18 './browser_test_commands_linux.txt',
19 '../../remoting/tools/internal/test_accounts.json',
20 '<(PRODUCT_DIR)/libffmpegsumo.so', 19 '<(PRODUCT_DIR)/libffmpegsumo.so',
21 '<(PRODUCT_DIR)/libosmesa.so', 20 '<(PRODUCT_DIR)/libosmesa.so',
22 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 21 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
23 ], 22 ],
24 }, 23 },
25 }], 24 }],
26 ['OS=="linux" and use_ozone==0', { 25 ['OS=="linux" and use_ozone==0', {
27 'variables': { 26 'variables': {
28 'files': [ 27 'files': [
29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 28 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
30 ], 29 ],
31 }, 30 },
32 }], 31 }],
33 ['OS=="linux" or OS=="mac" or OS=="win"', { 32 ['OS=="linux" or OS=="mac" or OS=="win"', {
34 'variables': { 33 'variables': {
35 'files': [ 34 'files': [
36 '../test_env.py', 35 '../test_env.py',
37 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 36 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
38 '<(PRODUCT_DIR)/remoting/remoting.webapp/', 37 '<(PRODUCT_DIR)/remoting/remoting.webapp/',
38 '<(PRODUCT_DIR)/remoting/remoting.webapp.v2/',
39 '<(PRODUCT_DIR)/resources.pak', 39 '<(PRODUCT_DIR)/resources.pak',
40 '../../remoting/tools/internal/test_accounts.json',
40 ], 41 ],
41 'read_only': 1, 42 'read_only': 1,
42 }, 43 },
43 }], 44 }],
44 ['OS=="linux" or OS=="win"', { 45 ['OS=="linux" or OS=="win"', {
45 'variables': { 46 'variables': {
46 'files': [ 47 'files': [
47 '<(PRODUCT_DIR)/chrome_100_percent.pak', 48 '<(PRODUCT_DIR)/chrome_100_percent.pak',
48 '<(PRODUCT_DIR)/locales/en-US.pak', 49 '<(PRODUCT_DIR)/locales/en-US.pak',
49 ], 50 ],
(...skipping 26 matching lines...) Expand all
76 '--ui-test-action-timeout=100000', 77 '--ui-test-action-timeout=100000',
77 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', 78 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp',
78 '--extension-name=Chromoting', 79 '--extension-name=Chromoting',
79 ], 80 ],
80 }, 81 },
81 }], 82 }],
82 ], 83 ],
83 'includes': [ 84 'includes': [
84 '../../base/base.isolate', 85 '../../base/base.isolate',
85 ], 86 ],
86 } 87 }
OLDNEW
« no previous file with comments | « testing/chromoting/browser_tests_launcher.py ('k') | testing/chromoting/integration_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698