diff options
| -rw-r--r-- | build/gn_migration.gypi | 5 | ||||
| -rw-r--r-- | jingle/jingle.gyp | 19 | ||||
| -rw-r--r-- | jingle/jingle_unittests.isolate | 27 | ||||
| -rw-r--r-- | testing/buildbot/chromium.chromiumos.json | 9 | ||||
| -rw-r--r-- | testing/buildbot/chromium.fyi.json | 12 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 12 | ||||
| -rw-r--r-- | testing/buildbot/chromium.mac.json | 15 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.fyi.json | 9 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.json | 9 | ||||
| -rw-r--r-- | testing/buildbot/chromium.webkit.json | 6 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 15 |
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" }, { |