diff options
| author | Sergey Matveev <earthdok@chromium.org> | 2015-02-26 21:22:09 +0300 |
|---|---|---|
| committer | Sergey Matveev <earthdok@chromium.org> | 2015-02-26 18:23:54 +0000 |
| commit | e3b33ec5d354c9cf1b77a1c289dd9953cedc1761 (patch) | |
| tree | 9c94ae0aafd8ceed223afd2cd14bb24f912ada3e | |
| parent | 13ae7feb3bcd537c4c5e69276d94308c6c25aab0 (diff) | |
| download | chromium_src-e3b33ec5d354c9cf1b77a1c289dd9953cedc1761.zip chromium_src-e3b33ec5d354c9cf1b77a1c289dd9953cedc1761.tar.gz chromium_src-e3b33ec5d354c9cf1b77a1c289dd9953cedc1761.tar.bz2 | |
Convert DOS-style newlines in media/cast/cast_unittests.isolate
I ran the file through dos2unix. NOTRY because the newlines confuse trybots
("failed applying patch").
TBR=jam@chromium.org
BUG=98637
NOTRY=true
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/961873002
Cr-Commit-Position: refs/heads/master@{#318262}
| -rw-r--r-- | media/cast/cast_unittests.isolate | 172 |
1 files changed, 86 insertions, 86 deletions
diff --git a/media/cast/cast_unittests.isolate b/media/cast/cast_unittests.isolate index ce9f695..cb1e165 100644 --- a/media/cast/cast_unittests.isolate +++ b/media/cast/cast_unittests.isolate @@ -1,86 +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',
- ],
-}
+# 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', + ], +} |