diff options
| -rw-r--r-- | courgette/courgette.gyp | 17 | ||||
| -rw-r--r-- | courgette/courgette_unittests.isolate | 14 | ||||
| -rw-r--r-- | testing/buildbot/chromium.fyi.json | 56 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 35 | ||||
| -rw-r--r-- | testing/buildbot/chromium_trybot.json | 1 |
5 files changed, 13 insertions, 110 deletions
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"] }, { |