diff options
author | maruel <maruel@chromium.org> | 2015-07-06 12:58:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-06 19:59:20 +0000 |
commit | 772a157bf4300b635e3482d01214b2845959a8e9 (patch) | |
tree | ce475fb85e119ffb0ddb94735c5bb9826403549f /chrome | |
parent | 1d6674152570bc29ed98ea965c74c873de595587 (diff) | |
download | chromium_src-772a157bf4300b635e3482d01214b2845959a8e9.zip chromium_src-772a157bf4300b635e3482d01214b2845959a8e9.tar.gz chromium_src-772a157bf4300b635e3482d01214b2845959a8e9.tar.bz2 |
Convert chromedriver_unittests to run exclusively on Swarming
0 configs already ran on Swarming
19 used to run locally and were converted:
- chromium.fyi.json: Linux Trusty
- chromium.fyi.json: Linux Trusty (dbg)
- chromium.linux.json: Linux Tests
- chromium.linux.json: Linux Tests (dbg)(1)
- chromium.linux.json: Linux Tests (dbg)(1)(32)
- chromium.mac.json: Mac10.10 Tests
- chromium.mac.json: Mac10.6 Tests
- chromium.mac.json: Mac10.8 Tests
- chromium.mac.json: Mac10.9 Tests
- chromium.mac.json: Mac10.9 Tests (dbg)
- chromium.memory.fyi.json: Linux ChromeOS MSan Tests
- chromium.memory.fyi.json: Linux MSan Tests
- chromium.memory.fyi.json: Linux TSan Tests
- chromium.memory.json: Mac ASan 64 Tests (1)
- 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 chromedriver_unittests
R=thakis@chromium.org
BUG=98637
Review URL: https://codereview.chromium.org/1222713003
Cr-Commit-Position: refs/heads/master@{#337456}
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/chrome_tests.gypi | 20 | ||||
-rw-r--r-- | chrome/chromedriver_unittests.isolate | 48 |
2 files changed, 68 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 2b3983c..b6832fc 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3130,6 +3130,26 @@ ], }, { + 'target_name': 'chromedriver_unittests_run', + 'type': 'none', + 'dependencies': [ + 'chromedriver_unittests', + ], + 'conditions': [ + ['use_x11 == 1', { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + }], + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'chromedriver_unittests.isolate', + ], + }, + { 'target_name': 'interactive_ui_tests_run', 'type': 'none', 'dependencies': [ diff --git a/chrome/chromedriver_unittests.isolate b/chrome/chromedriver_unittests.isolate new file mode 100644 index 0000000..4d5fea4 --- /dev/null +++ b/chrome/chromedriver_unittests.isolate @@ -0,0 +1,48 @@ +# 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': [ + ['use_x11==0', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)', + 'test/data/chromedriver/', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} |