| 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',
|
|
|