diff options
author | jam <jam@chromium.org> | 2014-09-22 09:09:08 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-22 16:09:53 +0000 |
commit | b2c1542b0239e06c2dcc764af156054b5d5b8680 (patch) | |
tree | 7053241105b31a118195e1e26e4694dad43eeac9 /testing/chromoting/chromoting_integration_tests.isolate | |
parent | 4a8f8e3c726abb6ee5daa02a10f1c1c54e061f73 (diff) | |
download | chromium_src-b2c1542b0239e06c2dcc764af156054b5d5b8680.zip chromium_src-b2c1542b0239e06c2dcc764af156054b5d5b8680.tar.gz chromium_src-b2c1542b0239e06c2dcc764af156054b5d5b8680.tar.bz2 |
Revert of Swarming configuration files for chromoting integration tests (patchset #4 id:60001 of https://codereview.chromium.org/498373003/)
Reason for revert:
This is slowing down the trybots because it's uploading these files even though they're not used on trybots. look at how gpu isolates that are only used on the GPU builders are handled (there's a gyp variable which is only set by the builders which run these tests)
Original issue's description:
> Swarming configuration files for chromoting integration tests.
>
> BUG=
>
> Committed: https://crrev.com/d90ba4c4e4ddf5c4cbb6cf812c9571d628e30567
> Cr-Commit-Position: refs/heads/master@{#292785}
TBR=maruel@chromium.org,anandc@chromium.org,chaitali@chromium.org,anandc@google.com,leilei@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/591163002
Cr-Commit-Position: refs/heads/master@{#295980}
Diffstat (limited to 'testing/chromoting/chromoting_integration_tests.isolate')
-rw-r--r-- | testing/chromoting/chromoting_integration_tests.isolate | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate deleted file mode 100644 index a0145f7..0000000 --- a/testing/chromoting/chromoting_integration_tests.isolate +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright (c) 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'conditions': [ - ['OS=="linux"', { - 'variables': { - 'command': [ - '../xvfb.py', - '<(PRODUCT_DIR)', - '<(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', - ], - 'isolate_dependency_tracked': [ - '../xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ['OS=="linux" and target_arch=="x64"', { - 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'isolate_dependency_tracked': [ - '../test_env.py', - '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/remoting/remoting.webapp/', - '<(PRODUCT_DIR)/resources.pak', - ], - 'read_only': 1, - }, - }], - ['OS=="linux" or OS=="win"', { - 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/chrome_100_percent.pak', - '<(PRODUCT_DIR)/locales/en-US.pak', - ], - }, - }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/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', - ], - }, - }], - ], - 'includes': [ - '../../base/base.isolate', - ], -} |