diff options
| -rw-r--r-- | cc/cc_tests.gyp | 19 | ||||
| -rw-r--r-- | cc/cc_unittests.isolate | 83 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 21 | ||||
| -rw-r--r-- | testing/buildbot/chromium.mac.json | 28 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 35 | ||||
| -rw-r--r-- | testing/buildbot/chromium_memory_trybot.json | 7 | ||||
| -rw-r--r-- | testing/buildbot/chromium_trybot.json | 7 |
7 files changed, 15 insertions, 185 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 49337bc..74cb1bfd 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -444,23 +444,6 @@ }, ], } - ], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'cc_unittests_run', - 'type': 'none', - 'dependencies': [ - 'cc_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'cc_unittests.isolate', - ], - }, - ], - }], + ] ], } diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate deleted file mode 100644 index 4e5ac92..0000000 --- a/cc/cc_unittests.isolate +++ /dev/null @@ -1,83 +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': [ - 'test/data/', - '../testing/test_env.py', - '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ['OS=="linux"', { - 'variables': { - 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '<(PRODUCT_DIR)/cc_unittests', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - 'files': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - ], - }, - }], - ['OS=="linux" and use_ozone==0', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck', - ], - }, - }], - ['OS=="mac"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/cc_unittests', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - 'files': [ - '<(PRODUCT_DIR)/ffmpegsumo.so', - '<(PRODUCT_DIR)/osmesa.so', - ], - }, - }], - ['OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/cc_unittests.exe', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - 'files': [ - '<(PRODUCT_DIR)/ffmpegsumo.dll', - '<(PRODUCT_DIR)/osmesa.dll', - ], - }, - }], - ['OS=="win" and (fastbuild==0 or fastbuild==1)', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/cc_unittests.exe.pdb', - ], - }, - }], - ], - 'includes': [ - '../base/base.isolate', - ], -} diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index d4f43a1..7c71066 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -31,12 +31,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "components_unittests", @@ -204,12 +199,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "components_unittests", @@ -357,12 +347,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "components_unittests", diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 1e9f0e6..8f8a30e 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -28,12 +28,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "components_unittests", @@ -172,12 +167,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "components_unittests", @@ -316,12 +306,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "components_unittests", @@ -460,12 +445,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "components_unittests", diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index e958c74..a257144 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -20,12 +20,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", "chrome_elf_unittests", { @@ -145,12 +140,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", "chrome_elf_unittests", { @@ -280,12 +270,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", "chrome_elf_unittests", "components_browsertests", @@ -423,12 +408,7 @@ "aura_unittests", "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", "chrome_elf_unittests", "components_browsertests", @@ -564,12 +544,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", "chrome_elf_unittests", { diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json index ffd2124..af0f169 100644 --- a/testing/buildbot/chromium_memory_trybot.json +++ b/testing/buildbot/chromium_memory_trybot.json @@ -15,12 +15,7 @@ } }, "cacheinvalidation_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", { "test": "components_unittests", "swarming": { diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index 077b315..eef2619 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -52,12 +52,7 @@ }, "cacheinvalidation_unittests", "cast_unittests", - { - "test": "cc_unittests", - "swarming": { - "can_use_on_swarming_builders": true - } - }, + "cc_unittests", "chromedriver_unittests", { "test": "chromevox_tests", |