From 9086ff0072268267bacf28e6098a7b5bd8478982 Mon Sep 17 00:00:00 2001 From: jam Date: Tue, 20 Jan 2015 11:49:03 -0800 Subject: Swarm cc_unittests. BUG=448877 Review URL: https://codereview.chromium.org/854743002 Cr-Commit-Position: refs/heads/master@{#312252} --- cc/cc_tests.gyp | 19 ++++++- cc/cc_unittests.isolate | 83 ++++++++++++++++++++++++++++ testing/buildbot/chromium.linux.json | 21 ++++++- testing/buildbot/chromium.mac.json | 28 ++++++++-- testing/buildbot/chromium.win.json | 35 ++++++++++-- testing/buildbot/chromium_memory_trybot.json | 7 ++- testing/buildbot/chromium_trybot.json | 7 ++- 7 files changed, 185 insertions(+), 15 deletions(-) create mode 100644 cc/cc_unittests.isolate diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 74cb1bfd..49337bc 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -444,6 +444,23 @@ }, ], } - ] + ], + ['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 new file mode 100644 index 0000000..4e5ac92 --- /dev/null +++ b/cc/cc_unittests.isolate @@ -0,0 +1,83 @@ +# 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 7c71066..d4f43a1 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -31,7 +31,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "components_unittests", @@ -199,7 +204,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "components_unittests", @@ -347,7 +357,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "components_unittests", diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 8f8a30e..1e9f0e6 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -28,7 +28,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "components_unittests", @@ -167,7 +172,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "components_unittests", @@ -306,7 +316,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "components_unittests", @@ -445,7 +460,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "components_unittests", diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index a257144..e958c74 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -20,7 +20,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", "chrome_elf_unittests", { @@ -140,7 +145,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", "chrome_elf_unittests", { @@ -270,7 +280,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", "chrome_elf_unittests", "components_browsertests", @@ -408,7 +423,12 @@ "aura_unittests", "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", "chrome_elf_unittests", "components_browsertests", @@ -544,7 +564,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", "chrome_elf_unittests", { diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json index af0f169..ffd2124 100644 --- a/testing/buildbot/chromium_memory_trybot.json +++ b/testing/buildbot/chromium_memory_trybot.json @@ -15,7 +15,12 @@ } }, "cacheinvalidation_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, { "test": "components_unittests", "swarming": { diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index eef2619..077b315 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -52,7 +52,12 @@ }, "cacheinvalidation_unittests", "cast_unittests", - "cc_unittests", + { + "test": "cc_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "chromedriver_unittests", { "test": "chromevox_tests", -- cgit v1.1