summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel <maruel@chromium.org>2015-06-30 12:58:27 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-30 20:00:01 +0000
commit358f1af102ca23b2fd9c907cbe24af7078d5b830 (patch)
treebed71270b1a9dc6c8f0e9acbeaee61f0ce994c55
parent35152666883512567446b04dcf0e9d4bb804d1c0 (diff)
downloadchromium_src-358f1af102ca23b2fd9c907cbe24af7078d5b830.zip
chromium_src-358f1af102ca23b2fd9c907cbe24af7078d5b830.tar.gz
chromium_src-358f1af102ca23b2fd9c907cbe24af7078d5b830.tar.bz2
Convert jingle_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 jingle_unittests R=sergeyu@chromium.org,dpranke@chromium.org TBR= BUG=98637 Review URL: https://codereview.chromium.org/1221843002 Cr-Commit-Position: refs/heads/master@{#336858}
-rw-r--r--build/gn_migration.gypi5
-rw-r--r--jingle/jingle.gyp19
-rw-r--r--jingle/jingle_unittests.isolate27
-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
11 files changed, 138 insertions, 0 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 55aee12..865be4c 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -552,6 +552,11 @@
'../ui/aura/aura.gyp:aura_unittests_run',
],
}],
+ ['enable_webrtc==1 or OS!="android"', {
+ 'dependencies': [
+ '../jingle/jingle.gyp:jingle_unittests_run',
+ ],
+ }],
],
}],
['test_isolation_mode!="noop" and use_ash==1', {
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index ed0439c..2228d9b 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -180,6 +180,25 @@
],
},
],
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'jingle_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'jingle_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'jingle_unittests.isolate',
+ ],
+ },
+ ],
+ }],
+ ],
}, { # enable_webrtc!=1 and OS=="android"
'targets': [
# Stub targets as Android doesn't use libjingle when webrtc is disabled.
diff --git a/jingle/jingle_unittests.isolate b/jingle/jingle_unittests.isolate
new file mode 100644
index 0000000..625ac92
--- /dev/null
+++ b/jingle/jingle_unittests.isolate
@@ -0,0 +1,27 @@
+# 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': {
+ 'command': [
+ '../testing/test_env.py',
+ '<(PRODUCT_DIR)/jingle_unittests<(EXECUTABLE_SUFFIX)',
+ '--brave-new-test-launcher',
+ '--test-launcher-bot-mode',
+ '--asan=<(asan)',
+ '--msan=<(msan)',
+ '--tsan=<(tsan)',
+ ],
+ 'files': [
+ '../testing/test_env.py',
+ '<(PRODUCT_DIR)/jingle_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ ],
+ 'includes': [
+ '../base/base.isolate',
+ ],
+}
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 0947340..2fb12c7 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -241,6 +241,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -471,6 +474,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -697,6 +703,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 521d5b1..52f3660 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -1697,6 +1697,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -1848,6 +1851,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -2952,6 +2958,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -3369,6 +3378,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index d087a79..580f7b7 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -151,6 +151,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -604,6 +607,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -879,6 +885,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -1144,6 +1153,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index dc0d4e2..f030f75 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -135,6 +135,9 @@
"test": "gpu_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -340,6 +343,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -557,6 +563,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -774,6 +783,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -992,6 +1004,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json
index 6eb2acf..c9afa29 100644
--- a/testing/buildbot/chromium.memory.fyi.json
+++ b/testing/buildbot/chromium.memory.fyi.json
@@ -133,6 +133,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -363,6 +366,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -577,6 +583,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index e0abecf..d39d7e5 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -109,6 +109,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -323,6 +326,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -485,6 +491,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json
index 3bde5e9..d8a1be1 100644
--- a/testing/buildbot/chromium.webkit.json
+++ b/testing/buildbot/chromium.webkit.json
@@ -126,6 +126,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -343,6 +346,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 3593de0..94be333 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -136,6 +136,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -404,6 +407,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -800,6 +806,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -1065,6 +1074,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{
@@ -1498,6 +1510,9 @@
"test": "ipc_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "jingle_unittests"
},
{