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

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

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 '--commands_file',
11 './browser_test_commands_linux.txt', 11 './browser_test_commands_linux.txt',
12 '-p', 12 '--prod_dir',
13 '<(PRODUCT_DIR)', 13 '<(PRODUCT_DIR)',
14 '--cfg_file',
15 '../../remoting/tools/internal/test-account-host-config.json',
16 '--manifest_file',
17 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
18 '--user_profile_dir',
19 '/tmp/chromoting_test_profile',
14 ], 20 ],
15 'files': [ 21 'files': [
16 '../xvfb.py', 22 '../xvfb.py',
17 './browser_tests_launcher.py', 23 './browser_tests_launcher.py',
18 './browser_test_commands_linux.txt', 24 './browser_test_commands_linux.txt',
19 '<(PRODUCT_DIR)/libffmpegsumo.so', 25 '<(PRODUCT_DIR)/libffmpegsumo.so',
20 '<(PRODUCT_DIR)/libosmesa.so', 26 '<(PRODUCT_DIR)/libosmesa.so',
21 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 27 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
28 '../../remoting/tools/internal/test-account-host-config.json',
29 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
22 ], 30 ],
23 }, 31 },
24 }], 32 }],
25 ['OS=="linux" and use_ozone==0', { 33 ['OS=="linux" and use_ozone==0', {
26 'variables': { 34 'variables': {
27 'files': [ 35 'files': [
28 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 36 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
29 ], 37 ],
30 }, 38 },
31 }], 39 }],
32 ['OS=="linux" or OS=="mac" or OS=="win"', { 40 ['OS=="linux" or OS=="mac" or OS=="win"', {
33 'variables': { 41 'variables': {
34 'files': [ 42 'files': [
35 '../test_env.py', 43 '../test_env.py',
36 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 44 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
37 '<(PRODUCT_DIR)/remoting/remoting.webapp/', 45 '<(PRODUCT_DIR)/remoting/remoting.webapp/',
38 '<(PRODUCT_DIR)/remoting/remoting.webapp.v2/', 46 '<(PRODUCT_DIR)/remoting/remoting.webapp.v2/',
39 '<(PRODUCT_DIR)/resources.pak', 47 '<(PRODUCT_DIR)/resources.pak',
40 '../../remoting/tools/internal/test_accounts.json', 48 '../../remoting/tools/internal/test_accounts.json',
41 ], 49 ],
42 'read_only': 1, 50 'read_only': 1,
43 }, 51 },
44 }], 52 }],
45 ['OS=="linux" or OS=="win"', { 53 ['OS=="linux" or OS=="win"', {
46 'variables': { 54 'variables': {
47 'files': [ 55 'files': [
48 '<(PRODUCT_DIR)/chrome_100_percent.pak', 56 '<(PRODUCT_DIR)/chrome_100_percent.pak',
49 '<(PRODUCT_DIR)/locales/en-US.pak', 57 '<(PRODUCT_DIR)/locales/en-US.pak',
50 ], 58 ],
(...skipping 25 matching lines...) Expand all
76 '--run-manual', 84 '--run-manual',
77 '--ui-test-action-timeout=100000', 85 '--ui-test-action-timeout=100000',
78 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', 86 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp',
79 '--extension-name=Chromoting', 87 '--extension-name=Chromoting',
80 ], 88 ],
81 }, 89 },
82 }], 90 }],
83 ], 91 ],
84 'includes': [ 92 'includes': [
85 '../../base/base.isolate', 93 '../../base/base.isolate',
94 '../../gin/v8.isolate',
86 ], 95 ],
87 } 96 }
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