diff options
author | reillyg <reillyg@chromium.org> | 2015-06-30 17:54:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-01 00:55:11 +0000 |
commit | 202bc97cd38e0afe2701a4b5aa0ce4c4e2fcdd46 (patch) | |
tree | 6137ad481d901e9fd070e3e28d5de733491cbb4f /extensions/shell | |
parent | 0b58c80b6ab23b296135fc8bd505219b54a145bd (diff) | |
download | chromium_src-202bc97cd38e0afe2701a4b5aa0ce4c4e2fcdd46.zip chromium_src-202bc97cd38e0afe2701a4b5aa0ce4c4e2fcdd46.tar.gz chromium_src-202bc97cd38e0afe2701a4b5aa0ce4c4e2fcdd46.tar.bz2 |
Convert app_shell_unittests to run on Swarming
0 configs already ran on Swarming
13 used to run locally and were converted:
- chromium.chromiumos.json: Linux ChromiumOS Ozone Tests (1)
- chromium.chromiumos.json: Linux ChromiumOS Tests (1)
- chromium.chromiumos.json: Linux ChromiumOS Tests (dbg)(1)
- chromium.linux.json: Linux Tests
- chromium.linux.json: Linux Tests (dbg)(1)
- chromium.linux.json: Linux Tests (dbg)(1)(32)
- chromium.webkit.json: Linux ChromiumOS Tests (1)
- chromium.webkit.json: Linux ChromiumOS Tests (dbg)(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 app_shell_unittests
BUG=98637
Review URL: https://codereview.chromium.org/1218023007
Cr-Commit-Position: refs/heads/master@{#336943}
Diffstat (limited to 'extensions/shell')
-rw-r--r-- | extensions/shell/app_shell.gyp | 17 | ||||
-rw-r--r-- | extensions/shell/app_shell_unittests.isolate | 73 |
2 files changed, 90 insertions, 0 deletions
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index 25bd151..4a41b30 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -424,5 +424,22 @@ }, # target app_shell_helper ], }], # OS=="mac" + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'app_shell_unittests_run', + 'type': 'none', + 'dependencies': [ + 'app_shell_unittests', + ], + 'includes': [ + '../../build/isolate.gypi', + ], + 'sources': [ + 'app_shell_unittests.isolate', + ], + }, + ], + }], ], } diff --git a/extensions/shell/app_shell_unittests.isolate b/extensions/shell/app_shell_unittests.isolate new file mode 100644 index 0000000..a1d66fe --- /dev/null +++ b/extensions/shell/app_shell_unittests.isolate @@ -0,0 +1,73 @@ +# 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)/app_shell_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { + 'variables': { + 'command': [ + '../../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/app_shell_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--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', + '../test/data/', + '<(PRODUCT_DIR)/app_shell_unittests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/extensions_shell_and_test.pak', + ], + }, + }], + ['OS=="linux"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/libosmesa.so', + ], + }, + }], + ['OS=="mac"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/osmesa.so', + ], + }, + }], + ['OS=="win"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/osmesa.dll', + ], + }, + }], + ], + 'includes': [ + '../../base/base.isolate', + '../../gin/v8.isolate', + ], +} |