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

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

Issue 963723003: Start using v2 web-app for Mac browser-tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « no previous file | 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 './browser_tests_launcher.py', 9 './browser_tests_launcher.py',
10 '--commands_file', 10 '--commands_file',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 }], 73 }],
74 ['OS=="mac"', { 74 ['OS=="mac"', {
75 'variables': { 75 'variables': {
76 'files': [ 76 'files': [
77 '<(PRODUCT_DIR)/<(mac_product_name).app/', 77 '<(PRODUCT_DIR)/<(mac_product_name).app/',
78 '<(PRODUCT_DIR)/exif.so', 78 '<(PRODUCT_DIR)/exif.so',
79 '<(PRODUCT_DIR)/ffmpegsumo.so', 79 '<(PRODUCT_DIR)/ffmpegsumo.so',
80 ], 80 ],
81 }, 81 },
82 }], 82 }],
83 ['OS=="mac"', { 83 ['OS=="win" or OS=="mac"', {
84 'variables': { 84 'variables': {
85 'command': [ 85 'command': [
86 '../test_env.py', 86 '../test_env.py',
87 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
88 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch',
89 '--run-manual',
90 '--ui-test-action-timeout=100000',
91 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp',
92 '--extension-name=Chromoting',
93 ],
94 },
95 }],
96 ['OS=="win"', {
97 'variables': {
98 'command': [
99 '../test_env.py',
100 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 87 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
101 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch:RemoteDesktopBr owserTest.MANUAL_Auth', 88 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch:RemoteDesktopBr owserTest.MANUAL_Auth',
102 '--run-manual', 89 '--run-manual',
103 '--ui-test-action-timeout=100000', 90 '--ui-test-action-timeout=100000',
104 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp.v2', 91 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
105 '--extension-name=Chromoting', 92 '--extension-name=Chromoting',
106 '--accounts-file=../../remoting/tools/internal/test_accounts.json', 93 '--accounts-file=../../remoting/tools/internal/test_accounts.json',
107 '--account-type=gmail', 94 '--account-type=gmail',
108 ], 95 ],
109 }, 96 },
110 }], 97 }],
111 ], 98 ],
112 'includes': [ 99 'includes': [
113 '../../base/base.isolate', 100 '../../base/base.isolate',
114 '../../gin/v8.isolate', 101 '../../gin/v8.isolate',
115 ], 102 ],
116 } 103 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698