From 2bd0451c3a7f49f28495666274646a6011b8aa3d Mon Sep 17 00:00:00 2001 From: kochi Date: Thu, 22 Jan 2015 00:03:19 -0800 Subject: Revert of Revert of Revert of Isolate courgette_unittests (patchset #1 id:1 of https://codereview.chromium.org/867523002/) Reason for revert: Sorry for the mess - in the end, the original CL was causing the courgette_unittests failure. Reverting the original again. BUG=450912 Original issue's description: > Revert of Revert of Isolate courgette_unittests (patchset #1 id:1 of https://codereview.chromium.org/865133002/) > > Reason for revert: > The revert might have been wrong: reverting the revert again. > BUG=450912 > > Original issue's description: > > Revert of Isolate courgette_unittests (patchset #1 id:1 of https://codereview.chromium.org/868433002/) > > > > Reason for revert: > > http://crbug.com/450912 > > > > courget_unittests is failing on Win7(dbg) bots since build#34639. > > http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/34639 > > > > Original issue's description: > > > Isolate courgette_unittests > > > > > > Adding link to http://www.chromium.org/developers/testing/isolated-testing/for-swes for my future self. > > > > > > R=maruel@chromium.org,jochen@chromium.org > > > TBR=jam@chromium.org > > > BUG=98637 > > > > > > Committed: https://crrev.com/c9bd3b9a5667a36c05592ec9d16533be91b4567c > > > Cr-Commit-Position: refs/heads/master@{#312531} > > > > TBR=jam@chromium.org,jochen@chromium.org,maruel@chromium.org,scottmg@chromium.org > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=98637 > > > > Committed: https://crrev.com/1bdeeeb5eae42e95f82806da9351d77a05403e67 > > Cr-Commit-Position: refs/heads/master@{#312571} > > TBR=jam@chromium.org,jochen@chromium.org,maruel@chromium.org,scottmg@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=98637 > > Committed: https://crrev.com/217c53ca8128370c64a5d1a4ba15cb4cea5564ac > Cr-Commit-Position: refs/heads/master@{#312577} TBR=jam@chromium.org,jochen@chromium.org,maruel@chromium.org,scottmg@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=450912 Review URL: https://codereview.chromium.org/800333003 Cr-Commit-Position: refs/heads/master@{#312584} --- courgette/courgette.gyp | 17 ----------- courgette/courgette_unittests.isolate | 14 --------- testing/buildbot/chromium.fyi.json | 56 +++++------------------------------ testing/buildbot/chromium.win.json | 35 ++++------------------ testing/buildbot/chromium_trybot.json | 1 - 5 files changed, 13 insertions(+), 110 deletions(-) delete mode 100644 courgette/courgette_unittests.isolate diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp index bc8b7bb..52db0fb 100644 --- a/courgette/courgette.gyp +++ b/courgette/courgette.gyp @@ -213,22 +213,5 @@ }, ], }], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'courgette_unittests_run', - 'type': 'none', - 'dependencies': [ - 'courgette_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'courgette_unittests.isolate', - ], - }, - ], - }], ], } diff --git a/courgette/courgette_unittests.isolate b/courgette/courgette_unittests.isolate deleted file mode 100644 index 244cde1..0000000 --- a/courgette/courgette_unittests.isolate +++ /dev/null @@ -1,14 +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. -{ - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/courgette_unittests<(EXECUTABLE_SUFFIX)', - 'testdata/', - ], - 'command': [ - '<(PRODUCT_DIR)/courgette_unittests<(EXECUTABLE_SUFFIX)', - ], - }, -} diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 554e279..e30787f 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -366,12 +366,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", @@ -418,12 +413,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", @@ -470,12 +460,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", @@ -522,12 +507,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", @@ -574,12 +554,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", @@ -626,12 +601,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", @@ -678,12 +648,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", @@ -730,12 +695,7 @@ "cacheinvalidation_unittests", "chrome_elf_unittests", "components_unittests", - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "gcm_unit_tests", diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 7951682..a257144 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -42,12 +42,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "events_unittests", "extensions_unittests", @@ -167,12 +162,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "extensions_unittests", "events_unittests", @@ -303,12 +293,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "device_unittests", "events_unittests", @@ -446,12 +431,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "device_unittests", "events_unittests", @@ -587,12 +567,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "courgette_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "courgette_unittests", "crypto_unittests", "events_unittests", "extensions_unittests", diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index 391531e..eef2619 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -79,7 +79,6 @@ }, { "test": "courgette_unittests", - "can_use_on_swarming_builders": true, "platforms": ["win"] }, { -- cgit v1.1