summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authormaruel <maruel@chromium.org>2015-07-10 14:17:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-10 21:18:14 +0000
commitd6004d9a6aee05042ad2b90e3ee26e50c0e82579 (patch)
treea25b91f571ced71a776d06971ec042c28f149be8 /sandbox
parent587f96297f4a9d416b0d14ffce915194e2a772de (diff)
downloadchromium_src-d6004d9a6aee05042ad2b90e3ee26e50c0e82579.zip
chromium_src-d6004d9a6aee05042ad2b90e3ee26e50c0e82579.tar.gz
chromium_src-d6004d9a6aee05042ad2b90e3ee26e50c0e82579.tar.bz2
Convert sbox_integration_tests to run exclusively on Swarming
0 configs already ran on Swarming 7 used to run locally and were converted: - chromium.fyi.json: CrWinAsan tester - chromium.fyi.json: CrWinAsan(dll) tester - 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 sbox_integration_tests R=cpu@chromium.org,thakis@chromium.org BUG=98637 Review URL: https://codereview.chromium.org/1214053003 Cr-Commit-Position: refs/heads/master@{#338358}
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/sbox_integration_tests.isolate31
-rw-r--r--sandbox/win/sandbox_win.gypi17
2 files changed, 48 insertions, 0 deletions
diff --git a/sandbox/sbox_integration_tests.isolate b/sandbox/sbox_integration_tests.isolate
new file mode 100644
index 0000000..5a92ac0
--- /dev/null
+++ b/sandbox/sbox_integration_tests.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_integration_tests.exe',
+ ],
+ 'files': [
+ '<(PRODUCT_DIR)/sbox_integration_tests.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 69c2b9c..857d3c1 100644
--- a/sandbox/win/sandbox_win.gypi
+++ b/sandbox/win/sandbox_win.gypi
@@ -367,5 +367,22 @@
},
],
}],
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'sbox_integration_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'sbox_integration_tests',
+ ],
+ 'includes': [
+ '../../build/isolate.gypi',
+ ],
+ 'sources': [
+ '../sbox_integration_tests.isolate',
+ ],
+ },
+ ],
+ }],
],
}