diff options
| author | jbroman <jbroman@chromium.org> | 2015-06-30 11:43:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-30 18:45:14 +0000 |
| commit | 3d150020c67930bd9388d8c039439518f8ecfc0b (patch) | |
| tree | 9a888adcd7af94fe8f5bab903e874c791f140ea0 /skia | |
| parent | 4f03959fa98fe29e0ac78dd0995b09d3f26a363c (diff) | |
| download | chromium_src-3d150020c67930bd9388d8c039439518f8ecfc0b.zip chromium_src-3d150020c67930bd9388d8c039439518f8ecfc0b.tar.gz chromium_src-3d150020c67930bd9388d8c039439518f8ecfc0b.tar.bz2 | |
Write skia_unittests.isolate and enable swarming for skia_unittests.
BUG=98637
Review URL: https://codereview.chromium.org/1212893004
Cr-Commit-Position: refs/heads/master@{#336828}
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia_tests.gyp | 17 | ||||
| -rw-r--r-- | skia/skia_unittests.isolate | 44 |
2 files changed, 61 insertions, 0 deletions
diff --git a/skia/skia_tests.gyp b/skia/skia_tests.gyp index 698493d..015065c 100644 --- a/skia/skia_tests.gyp +++ b/skia/skia_tests.gyp @@ -60,5 +60,22 @@ }, ], }], + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'skia_unittests_run', + 'type': 'none', + 'dependencies': [ + 'skia_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'skia_unittests.isolate', + ], + }, + ], + }], ], } diff --git a/skia/skia_unittests.isolate b/skia/skia_unittests.isolate new file mode 100644 index 0000000..f88e5a8 --- /dev/null +++ b/skia/skia_unittests.isolate @@ -0,0 +1,44 @@ +# 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. +{ + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/skia_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + 'conditions': [ + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/skia_unittests<(EXECUTABLE_SUFFIX)', + ], + 'read_only': 1, + }, + }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/skia_unittests.dSYM/', + ], + }, + }], + ['OS=="win" and (fastbuild==0 or fastbuild==1)', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/skia_unittests.exe.pdb', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} |