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

Unified Diff: testing/chromoting/chromoting_integration_tests.isolate

Issue 1141793003: Update from https://crrev.com/329939 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/chromoting/browser_test_commands_linux.txt ('k') | testing/gtest_ios/unittest-Info.plist » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/chromoting/chromoting_integration_tests.isolate
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate
index 0bf8b7ac7f36d416d84b6b087863e7fd9d851574..6062cb2b2081c39f1ce07acef5c9968dc6c65636 100644
--- a/testing/chromoting/chromoting_integration_tests.isolate
+++ b/testing/chromoting/chromoting_integration_tests.isolate
@@ -85,7 +85,7 @@
],
},
}],
- ['OS=="win" or OS=="mac"', {
+ ['OS=="win"', {
'variables': {
'command': [
'../test_env.py',
@@ -100,6 +100,28 @@
],
},
}],
+ ['OS=="mac"', {
+ 'variables': {
+ 'command': [
+ '../test_env.py',
+ '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
+ '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch',
+ '--run-manual',
+ '--ui-test-action-timeout=100000',
+ '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
+ '--extension-name=Chromoting',
+ '--accounts-file=../../remoting/tools/internal/test_accounts.json',
+ '--account-type=gmail',
+ ],
+ },
+ }],
+ ['OS=="win" and kasko==1', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/kasko.dll',
+ ],
+ },
+ }],
],
'includes': [
'../../base/base.isolate',
« no previous file with comments | « testing/chromoting/browser_test_commands_linux.txt ('k') | testing/gtest_ios/unittest-Info.plist » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698