summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-07-16 07:55:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-16 14:56:24 +0000
commit38b7fe8b254a356f7e14d28c4b4033593956e1c9 (patch)
tree1dd242c7bdfac3a292451b2f493fef51d1ad76ad
parentf5e44003d79385d572aaf5bea9411ccfe7900b10 (diff)
downloadchromium_src-38b7fe8b254a356f7e14d28c4b4033593956e1c9.zip
chromium_src-38b7fe8b254a356f7e14d28c4b4033593956e1c9.tar.gz
chromium_src-38b7fe8b254a356f7e14d28c4b4033593956e1c9.tar.bz2
Revert of Swarm setup_unittests on FYI bots. (patchset #2 id:40001 of https://codereview.chromium.org/1223293004/)
Reason for revert: This seems to not work: https://chromium-swarm.appspot.com/user/task/28ace3bc39b53310 Original issue's description: > Swarm setup_unittests on FYI bots. > > BUG=153829 > > Committed: https://crrev.com/b398dec5088da75d3fbfb8d810c9b6f69ec7182a > Cr-Commit-Position: refs/heads/master@{#338902} TBR=maruel@chromium.org,grt@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=153829 Review URL: https://codereview.chromium.org/1239083002 Cr-Commit-Position: refs/heads/master@{#339026}
-rw-r--r--build/gn_migration.gypi1
-rw-r--r--chrome/chrome_installer.gypi13
-rw-r--r--chrome/setup_unittests.isolate22
-rw-r--r--testing/buildbot/chromium.fyi.json96
-rw-r--r--testing/buildbot/ninja_to_gn.pyl1
5 files changed, 0 insertions, 133 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 83c157f..422ac29 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -569,7 +569,6 @@
['OS=="win"', {
'dependencies': [
'../chrome/chrome.gyp:installer_util_unittests_run',
- '../chrome/chrome.gyp:setup_unittests_run',
'../sandbox/sandbox.gyp:sbox_integration_tests',
'../sandbox/sandbox.gyp:sbox_unittests',
'../sandbox/sandbox.gyp:sbox_validation_tests',
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index f1b15cc..d5d071e 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -1088,19 +1088,6 @@
'installer_util_unittests.isolate',
],
},
- {
- 'target_name': 'setup_unittests_run',
- 'type': 'none',
- 'dependencies': [
- 'setup_unittests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- ],
- 'sources': [
- 'setup_unittests.isolate',
- ],
- },
],
}],
],
diff --git a/chrome/setup_unittests.isolate b/chrome/setup_unittests.isolate
deleted file mode 100644
index 5b10de8..0000000
--- a/chrome/setup_unittests.isolate
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2015 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=="win"', {
- 'variables': {
- 'command': [
- '<(PRODUCT_DIR)/setup_unittests.exe',
- ],
- 'files': [
- '<(PRODUCT_DIR)/setup_unittests.exe',
- 'installer/test/data/',
- 'test/data/installer/',
- ],
- },
- }],
- ],
- 'includes': [
- '../base/base.isolate',
- ],
-}
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index d8b9b30..f334699 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -294,12 +294,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -1116,12 +1110,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -1253,12 +1241,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -1390,12 +1372,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -1527,12 +1503,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -1664,12 +1634,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -1813,12 +1777,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -1991,12 +1949,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -2169,12 +2121,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -2318,12 +2264,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -2455,12 +2395,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -2592,12 +2526,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -2729,12 +2657,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -2844,12 +2766,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -2978,12 +2894,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
@@ -3115,12 +3025,6 @@
"test": "sbox_validation_tests"
},
{
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "setup_unittests"
- },
- {
"test": "skia_unittests"
},
{
diff --git a/testing/buildbot/ninja_to_gn.pyl b/testing/buildbot/ninja_to_gn.pyl
index 5e26949..413f045 100644
--- a/testing/buildbot/ninja_to_gn.pyl
+++ b/testing/buildbot/ninja_to_gn.pyl
@@ -84,7 +84,6 @@
"sbox_integration_tests": "//sandbox/win:sbox_integration_tests",
"sbox_unittests": "//sandbox/win:sbox_unittests",
"sbox_validation_tests": "//sandbox/win:sbox_validation_tests",
- "setup_unittests": "//chrome/installer/setup:setup_unittests",
"skia_unittests": "//skia:skia_unittests",
"sql_unittests": "//sql:sql_unittests",
"sync_integration_tests": "//sync:sync_integration_tests",