summaryrefslogtreecommitdiffstats
path: root/testing/chromoting/chromoting_integration_tests.isolate
diff options
context:
space:
mode:
authoranandc <anandc@chromium.org>2015-03-04 15:47:40 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-04 23:48:10 +0000
commit78d4c037b6fbf327849a8e730a92bcf692c153fb (patch)
tree931244b3c03b3aa975e3c0f67bcc78a5152686f5 /testing/chromoting/chromoting_integration_tests.isolate
parent3d63f87a54b716903100441cbcedbcbabbb33060 (diff)
downloadchromium_src-78d4c037b6fbf327849a8e730a92bcf692c153fb.zip
chromium_src-78d4c037b6fbf327849a8e730a92bcf692c153fb.tar.gz
chromium_src-78d4c037b6fbf327849a8e730a92bcf692c153fb.tar.bz2
Start using v2 web-app for Mac browser-tests. Also start running Auth test.
BUG= Review URL: https://codereview.chromium.org/963723003 Cr-Commit-Position: refs/heads/master@{#319165}
Diffstat (limited to 'testing/chromoting/chromoting_integration_tests.isolate')
-rw-r--r--testing/chromoting/chromoting_integration_tests.isolate15
1 files changed, 1 insertions, 14 deletions
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate
index 6266728..82bf5f1 100644
--- a/testing/chromoting/chromoting_integration_tests.isolate
+++ b/testing/chromoting/chromoting_integration_tests.isolate
@@ -80,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',