Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2014 Google Inc. All Rights Reserved. | 1 # Copyright (c) 2014 Google Inc. All Rights Reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1 | 7 'chromium_code': 1 |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 # Disable PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_We bM (not supported) | 104 # Disable PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_We bM (not supported) |
| 105 'media_unittests --gtest_filter=-PipelineIntegrationTest.BasicPlay back_MediaSource_VP9_WebM', | 105 'media_unittests --gtest_filter=-PipelineIntegrationTest.BasicPlay back_MediaSource_VP9_WebM', |
| 106 ], | 106 ], |
| 107 } | 107 } |
| 108 }], | 108 }], |
| 109 ['disable_display==0', { | 109 ['disable_display==0', { |
| 110 'dependencies': [ | 110 'dependencies': [ |
| 111 '../gpu/gpu.gyp:gpu_unittests', | 111 '../gpu/gpu.gyp:gpu_unittests', |
| 112 ], | 112 ], |
| 113 }], | 113 }], |
| 114 ['OS!="android"', { | 114 ['OS!="android" and disable_display==0', { |
| 115 'dependencies': [ | 115 'dependencies': [ |
| 116 'cast_shell_browser_test', | 116 'cast_shell_browser_test', |
|
gunsch
2015/06/10 16:25:20
Are you also disabling cast_shell_browser_test? Th
cleichner
2015/06/10 18:00:34
Re-enabled cast_shell_browser_test because it actu
| |
| 117 'media/media.gyp:cast_media_unittests', | 117 'media/media.gyp:cast_media_unittests', |
| 118 ], | 118 ], |
| 119 'variables': { | 119 'variables': { |
| 120 'filters': [ | 120 'filters': [ |
| 121 'cast_shell_browser_test --no-sandbox --disable-gpu', | 121 'cast_shell_browser_test --no-sandbox --disable-gpu', |
| 122 ], | 122 ], |
| 123 }, | 123 }, |
| 124 }], | 124 }], |
| 125 ['disable_display==1', { | |
| 126 'dependencies': [ | |
| 127 'media/media.gyp:cast_media_unittests', | |
| 128 ], | |
| 129 'variables': { | |
| 130 'filters': [ | |
| 131 # These are not supported by the backend right now. b/21737919 | |
| 132 'cast_media_unittests --gtest_filter=-AudioVideoPipelineDeviceTest .VorbisPlayback:AudioVideoPipelineDeviceTest.WebmPlayback', | |
| 133 ], | |
| 134 } | |
| 135 }], | |
| 125 ], | 136 ], |
| 126 'includes': ['build/tests/test_list.gypi'], | 137 'includes': ['build/tests/test_list.gypi'], |
| 127 }, | 138 }, |
| 128 # Builds all tests and the output lists of build/run targets for those tests . | 139 # Builds all tests and the output lists of build/run targets for those tests . |
| 129 # Note: producing a predetermined list of dependent inputs on which to | 140 # Note: producing a predetermined list of dependent inputs on which to |
| 130 # regenerate this output is difficult with GYP. This file is not | 141 # regenerate this output is difficult with GYP. This file is not |
| 131 # guaranteed to be regenerated outside of a clean build. | 142 # guaranteed to be regenerated outside of a clean build. |
| 132 { | 143 { |
| 133 'target_name': 'cast_test_lists', | 144 'target_name': 'cast_test_lists', |
| 134 'type': 'none', | 145 'type': 'none', |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 258 'HAS_OUT_OF_PROC_TEST_RUNNER', | 269 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 259 ], | 270 ], |
| 260 'sources': [ | 271 'sources': [ |
| 261 'browser/test/chromecast_shell_browser_test.cc', | 272 'browser/test/chromecast_shell_browser_test.cc', |
| 262 ], | 273 ], |
| 263 }, | 274 }, |
| 264 ], # end of targets | 275 ], # end of targets |
| 265 }], | 276 }], |
| 266 ], # end of conditions | 277 ], # end of conditions |
| 267 } | 278 } |
| OLD | NEW |