summaryrefslogtreecommitdiffstats
path: root/jingle
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 /jingle
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}
Diffstat (limited to 'jingle')
-rw-r--r--jingle/jingle.gyp19
-rw-r--r--jingle/jingle_unittests.isolate27
2 files changed, 46 insertions, 0 deletions
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',
+ ],
+}