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

Unified Diff: testing/chromoting/chromoting_integration_tests.isolate

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/buildbot/trybot_analyze_config.json ('k') | testing/commit_queue/config.json » ('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 be04bd6a822006865ef388b736dcb99a254ae6f9..82bf5f1c2753a2e5ec2d4fc2945f5a6c540c84b8 100644
--- a/testing/chromoting/chromoting_integration_tests.isolate
+++ b/testing/chromoting/chromoting_integration_tests.isolate
@@ -30,6 +30,7 @@
'../../remoting/tools/internal/test-account-host-config.json',
'<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
'<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
+ '<(PRODUCT_DIR)/remoting-me2me-host.deb',
],
},
}],
@@ -79,20 +80,7 @@
],
},
}],
- ['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',
- '--extension-name=Chromoting',
- ],
- },
- }],
- ['OS=="win"', {
+ ['OS=="win" or OS=="mac"', {
'variables': {
'command': [
'../test_env.py',
@@ -100,7 +88,7 @@
'--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch:RemoteDesktopBrowserTest.MANUAL_Auth',
'--run-manual',
'--ui-test-action-timeout=100000',
- '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp',
+ '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
'--extension-name=Chromoting',
'--accounts-file=../../remoting/tools/internal/test_accounts.json',
'--account-type=gmail',
« no previous file with comments | « testing/buildbot/trybot_analyze_config.json ('k') | testing/commit_queue/config.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698