diff options
| author | Scott Graham <scottmg@chromium.org> | 2015-02-25 17:16:18 -0800 |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2015-02-26 01:18:52 +0000 |
| commit | 072866f18863c8596d84b430030bf26db147f13f (patch) | |
| tree | 205681823e3d9b7e148771dcf4582f97db2c8bfb /media | |
| parent | 43ad5f2c3eb7466f8a08952cc5dff15931d9126e (diff) | |
| download | chromium_src-072866f18863c8596d84b430030bf26db147f13f.zip chromium_src-072866f18863c8596d84b430030bf26db147f13f.tar.gz chromium_src-072866f18863c8596d84b430030bf26db147f13f.tar.bz2 | |
isolate cast_unittests
R=maruel@chromium.org
TBR=jam@chromium.org
BUG=98637
Review URL: https://codereview.chromium.org/958733002
Cr-Commit-Position: refs/heads/master@{#318167}
Diffstat (limited to 'media')
| -rw-r--r-- | media/cast/cast_testing.gypi | 21 | ||||
| -rw-r--r-- | media/cast/cast_unittests.isolate | 86 |
2 files changed, 105 insertions, 2 deletions
diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi index 29d6901..fbc4d47 100644 --- a/media/cast/cast_testing.gypi +++ b/media/cast/cast_testing.gypi @@ -21,12 +21,12 @@ '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', ], 'sources': [ - 'test/loopback_transport.cc', - 'test/loopback_transport.h', 'test/fake_media_source.cc', 'test/fake_media_source.h', 'test/fake_single_thread_task_runner.cc', 'test/fake_single_thread_task_runner.h', + 'test/loopback_transport.cc', + 'test/loopback_transport.h', 'test/skewed_single_thread_task_runner.cc', 'test/skewed_single_thread_task_runner.h', 'test/skewed_tick_clock.cc', @@ -363,5 +363,22 @@ ], }], # targets }], # OS=="ios" or OS=="mac" + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'cast_unittests_run', + 'type': 'none', + 'dependencies': [ + 'cast_unittests', + ], + 'includes': [ + '../../build/isolate.gypi', + ], + 'sources': [ + 'cast_unittests.isolate', + ], + }, + ], + }], ], # conditions } diff --git a/media/cast/cast_unittests.isolate b/media/cast/cast_unittests.isolate new file mode 100644 index 0000000..ce9f695 --- /dev/null +++ b/media/cast/cast_unittests.isolate @@ -0,0 +1,86 @@ +# 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=="linux"', {
+ 'variables': {
+ 'command': [
+ '../../testing/xvfb.py',
+ '<(PRODUCT_DIR)',
+ '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
+ '--brave-new-test-launcher',
+ '--test-launcher-bot-mode',
+ '--asan=<(asan)',
+ '--lsan=<(lsan)',
+ '--msan=<(msan)',
+ '--tsan=<(tsan)',
+ ],
+ 'files': [
+ '../../testing/xvfb.py',
+ '<(PRODUCT_DIR)/libffmpegsumo.so',
+ ],
+ },
+ }],
+ ['OS=="linux" and use_ozone==0', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'files': [
+ '../../testing/test_env.py',
+ '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ ['OS=="mac"', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
+ ],
+ },
+ }],
+ ['OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'command': [
+ '../../testing/test_env.py',
+ '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
+ '--brave-new-test-launcher',
+ '--test-launcher-bot-mode',
+ '--asan=<(asan)',
+ '--lsan=<(lsan)',
+ '--msan=<(msan)',
+ '--tsan=<(tsan)',
+ ],
+ },
+ }],
+ ['OS=="mac" and asan==1 and fastbuild==0', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/cast_unittests.dSYM/',
+ ],
+ },
+ }],
+ ['OS=="win"', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/ffmpegsumo.dll',
+ ],
+ },
+ }],
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/cast_unittests.exe.pdb',
+ ],
+ },
+ }],
+ ],
+ 'includes': [
+ '../../base/base.isolate',
+ ],
+}
|