forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reland: Extract media/capture/capture_unittests from media_unittests
Original CL got reverted due to audio_unittests not finding two symbols error LNK2019: unresolved external symbol CLSID_DxDiagProvider error LNK2019: unresolved external symbol IID_IDxDiagProvider CQ doesn't have any gyp + win x64 bot, so didn't catch it, but it can be repro using win_clang_x64_rel bot -- see it failing in PS1 and compiling in PS2. Original's issue description ------------------------------------------- Extract media/capture/capture_unittests from media_unittests This CL: - extracts capture_unittests out of media_unittests. - adds it to all testing/buildbot/*.json where appropriate, i.e. where there is media_unittests. - adds the necessary .isolate and _apk.isolate. BUG=618718 TEST= No new code added, all bots running capture_unittests and being happy with it.¯ ------------------------------------------------------------------------ TBR=miu@chromium.org, xhwang@chromium.org, maruel@chromium.org, brettw@chromium.org Review-Url: https://codereview.chromium.org/2095623003 Cr-Commit-Position: refs/heads/master@{#401927}
- Loading branch information
1 parent
3e3545a
commit d2f53ea
Showing
24 changed files
with
649 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| # Copyright 2016 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. | ||
| { | ||
| 'includes': [ | ||
| '../../base/base.isolate', | ||
| ], | ||
| 'conditions': [ | ||
| ['use_x11==0', { | ||
| 'variables': { | ||
| 'command': [ | ||
| '../../testing/test_env.py', | ||
| '<(PRODUCT_DIR)/capture_unittests<(EXECUTABLE_SUFFIX)', | ||
| '--brave-new-test-launcher', | ||
| '--test-launcher-bot-mode', | ||
| '--asan=<(asan)', | ||
| '--msan=<(msan)', | ||
| '--tsan=<(tsan)', | ||
| ], | ||
| }, | ||
| }], | ||
| ['use_x11==1', { | ||
| 'variables': { | ||
| 'command': [ | ||
| '../../testing/xvfb.py', | ||
| '<(PRODUCT_DIR)', | ||
| '<(PRODUCT_DIR)/capture_unittests', | ||
| '--brave-new-test-launcher', | ||
| '--test-launcher-bot-mode', | ||
| '--asan=<(asan)', | ||
| '--msan=<(msan)', | ||
| '--tsan=<(tsan)', | ||
| ], | ||
| 'files': [ | ||
| '../../testing/xvfb.py', | ||
| '<(PRODUCT_DIR)/xdisplaycheck', | ||
| ], | ||
| }, | ||
| }], | ||
| ['OS=="linux" or OS=="mac" or OS=="win"', { | ||
| 'variables': { | ||
| 'files': [ | ||
| '../../testing/test_env.py', | ||
| ], | ||
| }, | ||
| }], | ||
| ['OS=="mac" and asan==1 and fastbuild==0', { | ||
| 'variables': { | ||
| 'files': [ | ||
| '<(PRODUCT_DIR)/capture_unittests.dSYM/', | ||
| ], | ||
| }, | ||
| }], | ||
| ['OS=="win" and (fastbuild==0 or fastbuild==1)', { | ||
| 'variables': { | ||
| 'files': [ | ||
| '<(PRODUCT_DIR)/capture_unittests.exe.pdb', | ||
| ], | ||
| }, | ||
| }], | ||
| ], | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # 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. | ||
| { | ||
| 'includes': [ | ||
| '../../build/android/android.isolate', | ||
| ], | ||
| 'variables': { | ||
| 'command': [ | ||
| '<(PRODUCT_DIR)/bin/run_capture_unittests', | ||
| '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', | ||
| ], | ||
| 'files': [ | ||
| '<(PRODUCT_DIR)/bin/run_capture_unittests', | ||
| '<(PRODUCT_DIR)/capture_unittests_apk/', | ||
| ] | ||
| }, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.