summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel <maruel@chromium.org>2015-06-30 14:55:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-30 21:56:14 +0000
commitdd228cfaec87f98fcca1a594bd99a65b5b657d27 (patch)
tree4e7a972592bc8616874cce873f40a8612d67050f
parent40d4d9c6d54392e9aefa3734941d3268961e32c1 (diff)
downloadchromium_src-dd228cfaec87f98fcca1a594bd99a65b5b657d27.zip
chromium_src-dd228cfaec87f98fcca1a594bd99a65b5b657d27.tar.gz
chromium_src-dd228cfaec87f98fcca1a594bd99a65b5b657d27.tar.bz2
Convert sql_unittests to run exclusively on Swarming
0 configs already ran on Swarming 29 used to run locally and were converted: - chromium.chromiumos.json: Linux ChromiumOS Ozone Tests (1) - chromium.chromiumos.json: Linux ChromiumOS Tests (1) - chromium.chromiumos.json: Linux ChromiumOS Tests (dbg)(1) - chromium.fyi.json: CrWinAsan tester - chromium.fyi.json: CrWinAsan(dll) tester - chromium.fyi.json: Linux Trusty - chromium.fyi.json: Linux Trusty (dbg) - chromium.linux.json: Cast Linux - chromium.linux.json: Linux Tests - chromium.linux.json: Linux Tests (dbg)(1) - chromium.linux.json: Linux Tests (dbg)(1)(32) - chromium.mac.json: Mac10.10 Tests - chromium.mac.json: Mac10.6 Tests - chromium.mac.json: Mac10.8 Tests - chromium.mac.json: Mac10.9 Tests - chromium.mac.json: Mac10.9 Tests (dbg) - chromium.memory.fyi.json: Linux ChromeOS MSan Tests - chromium.memory.fyi.json: Linux MSan Tests - chromium.memory.fyi.json: Linux TSan Tests - chromium.memory.json: Linux ASan LSan Tests (1) - chromium.memory.json: Linux Chromium OS ASan LSan Tests (1) - chromium.memory.json: Mac ASan 64 Tests (1) - chromium.webkit.json: Linux ChromiumOS Tests (1) - chromium.webkit.json: Linux ChromiumOS Tests (dbg)(1) - chromium.win.json: Vista Tests (1) - chromium.win.json: Win 7 Tests x64 (1) - chromium.win.json: Win7 Tests (1) - chromium.win.json: Win7 Tests (dbg)(1) - chromium.win.json: XP Tests (1) Ran: ./manage.py --convert sql_unittests R=gbillock@chromium.org,dpranke@chromium.org TBR= BUG=98637 Review URL: https://codereview.chromium.org/1217173004 Cr-Commit-Position: refs/heads/master@{#336884}
-rw-r--r--sql/sql_unittests.isolate19
-rw-r--r--testing/buildbot/chromium.chromiumos.json9
-rw-r--r--testing/buildbot/chromium.fyi.json12
-rw-r--r--testing/buildbot/chromium.linux.json12
-rw-r--r--testing/buildbot/chromium.mac.json15
-rw-r--r--testing/buildbot/chromium.memory.fyi.json9
-rw-r--r--testing/buildbot/chromium.memory.json9
-rw-r--r--testing/buildbot/chromium.webkit.json6
-rw-r--r--testing/buildbot/chromium.win.json15
9 files changed, 105 insertions, 1 deletions
diff --git a/sql/sql_unittests.isolate b/sql/sql_unittests.isolate
index f422ae6..44246d7 100644
--- a/sql/sql_unittests.isolate
+++ b/sql/sql_unittests.isolate
@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# 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.
{
@@ -10,6 +10,23 @@
],
},
}],
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'command': [
+ '../testing/test_env.py',
+ '<(PRODUCT_DIR)/sql_unittests<(EXECUTABLE_SUFFIX)',
+ '--brave-new-test-launcher',
+ '--test-launcher-bot-mode',
+ '--asan=<(asan)',
+ '--msan=<(msan)',
+ '--tsan=<(tsan)',
+ ],
+ 'files': [
+ '../testing/test_env.py',
+ '<(PRODUCT_DIR)/sql_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
],
'includes': [
'../base/base.isolate',
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index f565642..c083664 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -307,6 +307,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -543,6 +546,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -778,6 +784,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 466e9aa..a5e92b9 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -1745,6 +1745,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -1902,6 +1905,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -3033,6 +3039,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -3459,6 +3468,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 6b43a3a..2765075 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -184,6 +184,9 @@
"test": "sandbox_linux_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -679,6 +682,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -966,6 +972,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -1237,6 +1246,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 51e2394..ae404b6 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -201,6 +201,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -418,6 +421,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -641,6 +647,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -864,6 +873,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -1088,6 +1100,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json
index 1947f93..771b4a5 100644
--- a/testing/buildbot/chromium.memory.fyi.json
+++ b/testing/buildbot/chromium.memory.fyi.json
@@ -202,6 +202,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -441,6 +444,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -647,6 +653,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index ae6f40a..6357ed0 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -158,6 +158,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -390,6 +393,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -545,6 +551,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json
index afa95c9b5..df81f91 100644
--- a/testing/buildbot/chromium.webkit.json
+++ b/testing/buildbot/chromium.webkit.json
@@ -186,6 +186,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -412,6 +415,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 91c71ef..2729962 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -208,6 +208,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -491,6 +494,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -893,6 +899,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -1155,6 +1164,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{
@@ -1576,6 +1588,9 @@
"test": "skia_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "sql_unittests"
},
{