diff options
| -rw-r--r-- | extensions/extensions_browsertests.isolate | 62 | ||||
| -rw-r--r-- | extensions/extensions_tests.gyp | 19 | ||||
| -rw-r--r-- | testing/buildbot/chromium.chromiumos.json | 21 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 21 | ||||
| -rw-r--r-- | testing/buildbot/chromium.webkit.json | 14 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 35 | ||||
| -rw-r--r-- | testing/buildbot/chromium_trybot.json | 5 |
7 files changed, 14 insertions, 163 deletions
diff --git a/extensions/extensions_browsertests.isolate b/extensions/extensions_browsertests.isolate deleted file mode 100644 index c5da8dc..0000000 --- a/extensions/extensions_browsertests.isolate +++ /dev/null @@ -1,62 +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=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'files': [ - '../net/data/', - '../net/tools/testserver/', - '../testing/test_env.py', - '../third_party/pyftpdlib/', - '../third_party/pywebsocket/', - '../third_party/tlslite/', - '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/extensions_shell_and_test.pak', - 'test/data/', - ], - }, - }], - ['OS=="linux"', { - 'variables': { - 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - 'files': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)/libosmesa.so', - ], - }, - }], - ['OS=="linux" and use_ozone==0', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ], - 'includes': [ - '../base/base.isolate', - '../gin/v8.isolate', - ], -} diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp index 0f47938..aa5ad0e 100644 --- a/extensions/extensions_tests.gyp +++ b/extensions/extensions_tests.gyp @@ -230,23 +230,4 @@ ] }, ], - 'conditions': [ - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'extensions_browsertests_run', - 'type': 'none', - 'dependencies': [ - 'extensions_browsertests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'extensions_browsertests.isolate', - ], - }, - ], - }], - ], } diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 8f106b7..4ed436c 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -88,12 +88,7 @@ "nacl_loader_unittests", "app_shell_unittests", "chromevox_tests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "skia_unittests" ] }, @@ -122,12 +117,7 @@ "device_unittests", "display_unittests", "events_unittests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -257,12 +247,7 @@ "shards": 2 } }, - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "gcm_unit_tests", "skia_unittests", { diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index a0aa115..1efe19b 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -61,12 +61,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { @@ -234,12 +229,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { @@ -387,12 +377,7 @@ "can_use_on_swarming_builders": true } }, - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index 17cc5e9..d34d31e 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -85,12 +85,7 @@ "nacl_loader_unittests", "app_shell_unittests", "chromevox_tests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "skia_unittests" ] }, @@ -176,12 +171,7 @@ "shards": 2 } }, - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "gcm_unit_tests", "skia_unittests", { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 95134e6..c6c87b5 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -49,12 +49,7 @@ }, "crypto_unittests", "events_unittests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", @@ -178,12 +173,7 @@ } }, "crypto_unittests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "events_unittests", "gcm_unit_tests", @@ -321,12 +311,7 @@ "crypto_unittests", "device_unittests", "events_unittests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", @@ -469,12 +454,7 @@ "crypto_unittests", "device_unittests", "events_unittests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", @@ -614,12 +594,7 @@ }, "crypto_unittests", "events_unittests", - { - "test": "extensions_browsertests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index b73741f..df5a156 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -234,10 +234,7 @@ }, { "test": "extensions_browsertests", - "platforms": ["linux", "win"], - "swarming": { - "can_use_on_swarming_builders": true - } + "platforms": ["linux", "win"] }, { "test": "app_shell_unittests", |