diff options
| -rw-r--r-- | build/gn_migration.gypi | 1 | ||||
| -rw-r--r-- | sandbox/sbox_unittests.isolate | 31 | ||||
| -rw-r--r-- | sandbox/win/sandbox_win.gypi | 13 | ||||
| -rw-r--r-- | testing/buildbot/chromium.fyi.json | 6 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 15 |
5 files changed, 66 insertions, 0 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index eef20cb..a877af4 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -569,6 +569,7 @@ ['OS=="win"', { 'dependencies': [ '../sandbox/sandbox.gyp:sbox_integration_tests', + '../sandbox/sandbox.gyp:sbox_unittests', ], }], ['use_ash==1', { diff --git a/sandbox/sbox_unittests.isolate b/sandbox/sbox_unittests.isolate new file mode 100644 index 0000000..578835a --- /dev/null +++ b/sandbox/sbox_unittests.isolate @@ -0,0 +1,31 @@ +# 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. + +# Because of a limitation in isolate_driver.py, this file needs to be in +# the same directory as the main .gyp file. + +{ + 'conditions': [ + ['OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/sbox_unittests.exe', + ], + 'files': [ + '<(PRODUCT_DIR)/sbox_unittests.exe', + ], + }, + }], + ['OS=="win" and target_arch=="ia32"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/wow_helper.exe', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} diff --git a/sandbox/win/sandbox_win.gypi b/sandbox/win/sandbox_win.gypi index 857d3c1..7b8b74e6 100644 --- a/sandbox/win/sandbox_win.gypi +++ b/sandbox/win/sandbox_win.gypi @@ -382,6 +382,19 @@ '../sbox_integration_tests.isolate', ], }, + { + 'target_name': 'sbox_unittests_run', + 'type': 'none', + 'dependencies': [ + 'sbox_unittests', + ], + 'includes': [ + '../../build/isolate.gypi', + ], + 'sources': [ + '../sbox_unittests.isolate', + ], + }, ], }], ], diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index f742723..583788f 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -1753,6 +1753,9 @@ "test": "sbox_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "sbox_unittests" }, { @@ -1916,6 +1919,9 @@ "test": "sbox_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "sbox_unittests" }, { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 3e83247..40fb0db 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -223,6 +223,9 @@ "test": "sbox_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "sbox_unittests" }, { @@ -545,6 +548,9 @@ "test": "sbox_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "sbox_unittests" }, { @@ -990,6 +996,9 @@ "test": "sbox_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "sbox_unittests" }, { @@ -1292,6 +1301,9 @@ "test": "sbox_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "sbox_unittests" }, { @@ -1753,6 +1765,9 @@ "test": "sbox_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "sbox_unittests" }, { |