summaryrefslogtreecommitdiffstats
path: root/chrome_elf
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 /chrome_elf
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}
Diffstat (limited to 'chrome_elf')
-rw-r--r--chrome_elf/chrome_elf.gyp15
-rw-r--r--chrome_elf/chrome_elf_unittests.isolate22
2 files changed, 37 insertions, 0 deletions
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',
+ ],
+}