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

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

Issue 698203005: Include chrome_elf.dll and ffmpegsumo.dll in Windows isolate for Chromoting tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove superfluous comment. 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 | « 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 '-f', 10 '-f',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 }, 42 },
43 }], 43 }],
44 ['OS=="linux" or OS=="win"', { 44 ['OS=="linux" or OS=="win"', {
45 'variables': { 45 'variables': {
46 'files': [ 46 'files': [
47 '<(PRODUCT_DIR)/chrome_100_percent.pak', 47 '<(PRODUCT_DIR)/chrome_100_percent.pak',
48 '<(PRODUCT_DIR)/locales/en-US.pak', 48 '<(PRODUCT_DIR)/locales/en-US.pak',
49 ], 49 ],
50 }, 50 },
51 }], 51 }],
52 ['OS=="win"', {
53 'variables': {
54 'files': [
55 '<(PRODUCT_DIR)/chrome_elf.dll',
56 '<(PRODUCT_DIR)/ffmpegsumo.dll',
57 ],
58 },
59 }],
52 ['OS=="mac" or OS=="win"', { 60 ['OS=="mac" or OS=="win"', {
53 'variables': { 61 'variables': {
54 'command': [ 62 'command': [
55 '../test_env.py', 63 '../test_env.py',
56 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 64 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
57 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', 65 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch',
58 '--run-manual', 66 '--run-manual',
59 '--ui-test-action-timeout=100000', 67 '--ui-test-action-timeout=100000',
60 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', 68 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp',
61 '--extension-name=Chromoting', 69 '--extension-name=Chromoting',
62 ], 70 ],
63 }, 71 },
64 }], 72 }],
65 ], 73 ],
66 'includes': [ 74 'includes': [
67 '../../base/base.isolate', 75 '../../base/base.isolate',
68 ], 76 ],
69 } 77 }
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