Skip to content

GitLab

T
tangled
Commit e3b33ec5 authored by Sergey Matveev's avatar Sergey Matveev
Browse files
Options

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}
parent 13ae7feb
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 86 deletions
media/cast/cast_unittests.isolate
View file @ e3b33ec5
# Copyright 2015 The Chromium Authors. All rights reserved. # Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
{ {
'conditions': [ 'conditions': [
['OS=="linux"', { ['OS=="linux"', {
'variables': { 'variables': {
'command': [ 'command': [
'../../testing/xvfb.py', '../../testing/xvfb.py',
'<(PRODUCT_DIR)', '<(PRODUCT_DIR)',
'<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher', '--brave-new-test-launcher',
'--test-launcher-bot-mode', '--test-launcher-bot-mode',
'--asan=<(asan)', '--asan=<(asan)',
'--lsan=<(lsan)', '--lsan=<(lsan)',
'--msan=<(msan)', '--msan=<(msan)',
'--tsan=<(tsan)', '--tsan=<(tsan)',
], ],
'files': [ 'files': [
'../../testing/xvfb.py', '../../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libffmpegsumo.so',
], ],
}, },
}], }],
['OS=="linux" and use_ozone==0', { ['OS=="linux" and use_ozone==0', {
'variables': { 'variables': {
'files': [ 'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
], ],
}, },
}], }],
['OS=="linux" or OS=="mac" or OS=="win"', { ['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': { 'variables': {
'files': [ 'files': [
'../../testing/test_env.py', '../../testing/test_env.py',
'<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
], ],
}, },
}], }],
['OS=="mac"', { ['OS=="mac"', {
'variables': { 'variables': {
'files': [ 'files': [
'<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/ffmpegsumo.so',
], ],
}, },
}], }],
['OS=="mac" or OS=="win"', { ['OS=="mac" or OS=="win"', {
'variables': { 'variables': {
'command': [ 'command': [
'../../testing/test_env.py', '../../testing/test_env.py',
'<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher', '--brave-new-test-launcher',
'--test-launcher-bot-mode', '--test-launcher-bot-mode',
'--asan=<(asan)', '--asan=<(asan)',
'--lsan=<(lsan)', '--lsan=<(lsan)',
'--msan=<(msan)', '--msan=<(msan)',
'--tsan=<(tsan)', '--tsan=<(tsan)',
], ],
}, },
}], }],
['OS=="mac" and asan==1 and fastbuild==0', { ['OS=="mac" and asan==1 and fastbuild==0', {
'variables': { 'variables': {
'files': [ 'files': [
'<(PRODUCT_DIR)/cast_unittests.dSYM/', '<(PRODUCT_DIR)/cast_unittests.dSYM/',
], ],
}, },
}], }],
['OS=="win"', { ['OS=="win"', {
'variables': { 'variables': {
'files': [ 'files': [
'<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll',
], ],
}, },
}], }],
['OS=="win" and (fastbuild==0 or fastbuild==1)', { ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': { 'variables': {
'files': [ 'files': [
'<(PRODUCT_DIR)/cast_unittests.exe.pdb', '<(PRODUCT_DIR)/cast_unittests.exe.pdb',
], ],
}, },
}], }],
], ],
'includes': [ 'includes': [
'../../base/base.isolate', '../../base/base.isolate',
], ],
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment