summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-07-06 11:57:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-06 18:58:10 +0000
commit15593557f4f387d91dc7726511a20cb999c81561 (patch)
treea74c834c6153257c604f65753e9b97b9ba03ca4f
parent41933da18f43784ce9219700dbb8cf668ac219fe (diff)
downloadchromium_src-15593557f4f387d91dc7726511a20cb999c81561.zip
chromium_src-15593557f4f387d91dc7726511a20cb999c81561.tar.gz
chromium_src-15593557f4f387d91dc7726511a20cb999c81561.tar.bz2
Convert ipc_mojo_unittests to run exclusively on Swarming
0 configs already ran on Swarming 8 used to run locally and were converted: - chromium.linux.json: Android GN - chromium.linux.json: Linux Tests - chromium.linux.json: Linux Tests (dbg)(1) - chromium.linux.json: Linux Tests (dbg)(1)(32) - chromium.memory.fyi.json: Linux ChromeOS MSan Tests - chromium.memory.fyi.json: Linux MSan Tests - chromium.memory.fyi.json: Linux TSan Tests - chromium.win.json: XP Tests (1) Ran: ./manage.py --convert ipc_mojo_unittests BUG=98637 Review URL: https://codereview.chromium.org/1222243003 Cr-Commit-Position: refs/heads/master@{#337431}
-rw-r--r--build/gn_migration.gypi1
-rw-r--r--ipc/mojo/ipc_mojo.gyp15
-rw-r--r--ipc/mojo/ipc_mojo_unittests.isolate20
-rw-r--r--testing/buildbot/chromium.linux.json12
-rw-r--r--testing/buildbot/chromium.memory.fyi.json9
-rw-r--r--testing/buildbot/chromium.win.json3
6 files changed, 60 insertions, 0 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 0323765..e64e7c7 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -533,6 +533,7 @@
'../google_apis/gcm/gcm.gyp:gcm_unit_tests_run',
'../gpu/gpu.gyp:gpu_unittests_run',
'../ipc/ipc.gyp:ipc_tests_run',
+ '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests_run',
'../media/cast/cast.gyp:cast_unittests_run',
'../media/media.gyp:media_unittests_run',
'../media/midi/midi.gyp:midi_unittests_run',
diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp
index 313ecb2..40ce344 100644
--- a/ipc/mojo/ipc_mojo.gyp
+++ b/ipc/mojo/ipc_mojo.gyp
@@ -106,4 +106,19 @@
],
},
],
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'ipc_mojo_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'ipc_mojo_unittests',
+ ],
+ 'includes': [ '../../build/isolate.gypi' ],
+ 'sources': [ 'ipc_mojo_unittests.isolate' ],
+ },
+ ],
+ }],
+ ],
}
diff --git a/ipc/mojo/ipc_mojo_unittests.isolate b/ipc/mojo/ipc_mojo_unittests.isolate
new file mode 100644
index 0000000..390958a
--- /dev/null
+++ b/ipc/mojo/ipc_mojo_unittests.isolate
@@ -0,0 +1,20 @@
+# Copyright (c) 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': [
+ '<(PRODUCT_DIR)/ipc_mojo_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ 'files': [
+ '<(PRODUCT_DIR)/ipc_mojo_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ ],
+ 'includes': [
+ '../../base/base.isolate',
+ ],
+}
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 5168ee0..0e6bae2 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -13,6 +13,9 @@
"test": "html_viewer_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{
@@ -638,6 +641,9 @@
"test": "interactive_ui_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{
@@ -958,6 +964,9 @@
"test": "interactive_ui_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{
@@ -1268,6 +1277,9 @@
"test": "interactive_ui_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{
diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json
index 2b246dd..126ffe2 100644
--- a/testing/buildbot/chromium.memory.fyi.json
+++ b/testing/buildbot/chromium.memory.fyi.json
@@ -139,6 +139,9 @@
"test": "interactive_ui_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{
@@ -408,6 +411,9 @@
"test": "interactive_ui_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{
@@ -661,6 +667,9 @@
"test": "gpu_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 53dbd2c..7c2c30a 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -1651,6 +1651,9 @@
"test": "interactive_ui_tests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "ipc_mojo_unittests"
},
{