Commit b2c1542b authored by jam's avatar jam Committed by Commit bot

Revert of Swarming configuration files for chromoting integration tests...

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}
parent 4a8f8e3c
......@@ -1288,13 +1288,6 @@
'../net/net.gyp:net_unittests_run',
],
}, # target_name: chromium_swarm_tests
{
'target_name': 'chromoting_swarm_tests',
'type': 'none',
'dependencies': [
'../testing/chromoting/integration_test.gyp:chromoting_integration_tests_run',
],
}, # target_name: chromoting_swarm_tests
],
}],
['OS=="mac" and toolkit_views==1', {
......
# 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',
],
}
# 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': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'chromoting_integration_tests_run',
'type': 'none',
'dependencies': [
'../../chrome/chrome.gyp:browser_tests',
'../../remoting/remoting.gyp:remoting_webapp_v1',
],
'includes': [
'../../build/isolate.gypi',
'chromoting_integration_tests.isolate',
],
'sources': [
'chromoting_integration_tests.isolate',
],
},
],
}],
],
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment