summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2016-02-16 07:47:35 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-16 15:49:37 +0000
commite782a76f147e8f1cef0892ebdbd05e58c9c34f97 (patch)
tree11c9d3218d663c4f4f8aba6173bc307d85c145f7
parent0cbea5abf37d765ec043f66edc51daed33ac3f75 (diff)
downloadchromium_src-e782a76f147e8f1cef0892ebdbd05e58c9c34f97.zip
chromium_src-e782a76f147e8f1cef0892ebdbd05e58c9c34f97.tar.gz
chromium_src-e782a76f147e8f1cef0892ebdbd05e58c9c34f97.tar.bz2
Convert chrome_elf_unittests to run exclusively on Swarming
0 configs already ran on Swarming 20 used to run locally and were converted: - chromium.fyi.json: Chromium Win 10 - chromium.fyi.json: ClangToTWin tester - chromium.fyi.json: ClangToTWin(dbg) tester - chromium.fyi.json: ClangToTWin(dll) tester - chromium.fyi.json: ClangToTWin64 tester - chromium.fyi.json: ClangToTWin64(dbg) tester - chromium.fyi.json: ClangToTWin64(dll) tester - chromium.fyi.json: CrWinAsan tester - chromium.fyi.json: CrWinAsan(dll) tester - chromium.fyi.json: CrWinAsanCov tester - chromium.fyi.json: CrWinClang tester - chromium.fyi.json: CrWinClang(dbg) tester - chromium.fyi.json: CrWinClang(shared) tester - chromium.fyi.json: CrWinClang64 tester - chromium.fyi.json: CrWinClang64(dbg) tester - chromium.fyi.json: CrWinClang64(dll) tester - chromium.fyi.json: CrWinClangLLD tester - chromium.win.json: Win 7 Tests x64 (1) - chromium.win.json: Win7 Tests (1) - chromium.win.json: Win7 Tests (dbg)(1) Ran: ./manage.py --convert chrome_elf_unittests BUG=98637 TBR=caitkp Review URL: https://codereview.chromium.org/1223703002 Cr-Commit-Position: refs/heads/master@{#375581}
-rw-r--r--build/gn_migration.gypi1
-rw-r--r--chrome_elf/chrome_elf.gyp15
-rw-r--r--chrome_elf/chrome_elf_unittests.isolate22
-rw-r--r--testing/buildbot/chromium.fyi.json51
-rw-r--r--testing/buildbot/chromium.win.json9
-rw-r--r--testing/buildbot/gn_isolate_map.pyl2
6 files changed, 99 insertions, 1 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 91cd5315..7916d83 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -612,6 +612,7 @@
'dependencies': [
'../chrome/chrome.gyp:installer_util_unittests_run',
'../chrome/chrome.gyp:setup_unittests_run',
+ '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests_run',
'../sandbox/sandbox.gyp:sbox_integration_tests_run',
'../sandbox/sandbox.gyp:sbox_unittests_run',
'../sandbox/sandbox.gyp:sbox_validation_tests_run',
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index 26fc27c..5e6ecfc 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -146,4 +146,19 @@
],
},
], # targets
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'chrome_elf_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'chrome_elf_unittests',
+ ],
+ 'includes': [ '../build/isolate.gypi' ],
+ 'sources': [ 'chrome_elf_unittests.isolate' ],
+ },
+ ],
+ }],
+ ],
}
diff --git a/chrome_elf/chrome_elf_unittests.isolate b/chrome_elf/chrome_elf_unittests.isolate
new file mode 100644
index 0000000..3414ca6
--- /dev/null
+++ b/chrome_elf/chrome_elf_unittests.isolate
@@ -0,0 +1,22 @@
+# 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=="win"', {
+ 'variables': {
+ 'command': [
+ '<(PRODUCT_DIR)/chrome_elf_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ 'files': [
+ '<(PRODUCT_DIR)/blacklist_test_dll_1.dll',
+ '<(PRODUCT_DIR)/blacklist_test_dll_2.dll',
+ '<(PRODUCT_DIR)/blacklist_test_dll_3.dll',
+ ],
+ },
+ }],
+ ],
+ 'includes': [
+ '../base/base.isolate',
+ ],
+}
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 0d9fbf6..2c20188 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -810,6 +810,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -2255,6 +2258,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -2500,6 +2506,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -2745,6 +2754,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -2990,6 +3002,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -3235,6 +3250,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -3480,6 +3498,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -3713,6 +3734,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -3934,6 +3958,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -4148,6 +4175,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -4369,6 +4399,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -4614,6 +4647,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -4859,6 +4895,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -5104,6 +5143,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -5349,6 +5391,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -5594,6 +5639,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -5839,6 +5887,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 06cc571..9c724ee 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -69,6 +69,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -585,6 +588,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
@@ -995,6 +1001,9 @@
"test": "chrome_app_unittests"
},
{
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
"test": "chrome_elf_unittests"
},
{
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 81a3f291..3f7f4ba 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -172,7 +172,7 @@
},
"chrome_elf_unittests": {
"label": "//chrome_elf:chrome_elf_unittests",
- "type": "unknown",
+ "type": "raw",
},
"chromedriver_unittests": {
"label": "//chrome/test/chromedriver:chromedriver_unittests",