diff options
| -rw-r--r-- | build/gn_migration.gypi | 1 | ||||
| -rw-r--r-- | remoting/remoting_test.gypi | 19 | ||||
| -rw-r--r-- | remoting/remoting_unittests.isolate | 30 | ||||
| -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 | 9 | ||||
| -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, 133 insertions, 1 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 6798805..58bc6c7 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -538,6 +538,7 @@ '../media/midi/midi.gyp:midi_unittests_run', '../net/net.gyp:net_unittests_run', '../printing/printing.gyp:printing_unittests_run', + '../remoting/remoting.gyp:remoting_unittests_run', '../skia/skia_tests.gyp:skia_unittests_run', '../sql/sql.gyp:sql_unittests_run', '../sync/sync.gyp:sync_unit_tests_run', diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 4f8fefc..cc85620 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -612,6 +612,23 @@ 'includes': [ 'remoting_webapp.gypi', ], }, # end of target 'remoting_webapp_browser_test' ] - }] + }], + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'remoting_unittests_run', + 'type': 'none', + 'dependencies': [ + 'remoting_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'remoting_unittests.isolate', + ], + }, + ], + }], ] # end of 'conditions' } diff --git a/remoting/remoting_unittests.isolate b/remoting/remoting_unittests.isolate new file mode 100644 index 0000000..ed6fca8 --- /dev/null +++ b/remoting/remoting_unittests.isolate @@ -0,0 +1,30 @@ +# 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)/remoting_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../net/data/ssl/certificates/ok_cert.pem', + '../net/data/ssl/certificates/unittest.key.bin', + '../net/data/ssl/certificates/unittest.selfsigned.der', + '../testing/test_env.py', + '<(PRODUCT_DIR)/remoting_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 74846c1..c221734 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -304,6 +304,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -564,6 +567,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -823,6 +829,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index d934a6f..b559441 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -1736,6 +1736,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -1905,6 +1908,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -3051,6 +3057,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -3492,6 +3501,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 27a0177..13060f7 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -688,6 +688,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -996,6 +999,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -1294,6 +1300,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index d3d944c..bdeb859 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -201,6 +201,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -430,6 +433,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -668,6 +674,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -906,6 +915,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -1145,6 +1157,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json index 91f79ab..0303b2e 100644 --- a/testing/buildbot/chromium.memory.fyi.json +++ b/testing/buildbot/chromium.memory.fyi.json @@ -199,6 +199,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -459,6 +462,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -686,6 +692,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index 7e9bf1a..4568523 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json @@ -155,6 +155,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -405,6 +408,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -578,6 +584,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index 3bb3a15..6c782ed 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -186,6 +186,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -436,6 +439,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 8ab8c83..3a020d8 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -199,6 +199,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -503,6 +506,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -926,6 +932,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -1206,6 +1215,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { @@ -1645,6 +1657,9 @@ "test": "printing_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "remoting_unittests" }, { |