admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for use_x11 before runnig desktop_capture_modules_tests on linux.

Browse Source 
The tests need "x11/shared_x_display.h" which is not included when use_x11 is false and we're on linux.

The problem is:

screen_capturer_integration_test.cc
 - requires ->
screen_drawer.h
 - requires ->
screen_drawer_linux.cc
 - requires ->
x11/shared_x_display.h
 which is not included when use_x11 is false.

BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2684683003
Cr-Commit-Position: refs/heads/master@{#16529}
This commit is contained in:
ehmaldonado 2017-02-10 01:38:23 -08:00 committed by Commit bot
parent 38e9324e4e
commit 0d729b3039
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
webrtc/modules/desktop_capture/BUILD.gn
View File

@ -57,39 +57,37 @@ if (rtc_include_tests) {
rtc_source_set("desktop_capture_unittests") {
testonly = true
sources = []
deps = []
if (rtc_desktop_capture_supported || is_android) {
deps += [
":desktop_capture",
":primitives",
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../test:test_support",
"//testing/gmock",
]
sources += [
"desktop_region_unittest.cc",
"differ_block_unittest.cc",
]
}
sources = [
"desktop_and_cursor_composer_unittest.cc",
"desktop_capturer_differ_wrapper_unittest.cc",
"desktop_frame_rotation_unittest.cc",
"desktop_region_unittest.cc",
"differ_block_unittest.cc",
"mouse_cursor_monitor_unittest.cc",
"rgba_color_unittest.cc",
"test_utils.cc",
"test_utils.h",
"test_utils_unittest.cc",
"win/cursor_unittest.cc",
"win/cursor_unittest_resources.h",
"win/cursor_unittest_resources.rc",
]
deps = [
":desktop_capture",
":desktop_capture_mock",
":primitives",
":rgba_color",
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../test:test_support",
"//testing/gmock",
]
if (rtc_desktop_capture_supported) {
sources += [
"desktop_and_cursor_composer_unittest.cc",
"desktop_capturer_differ_wrapper_unittest.cc",
"desktop_frame_rotation_unittest.cc",
"mouse_cursor_monitor_unittest.cc",
"rgba_color_unittest.cc",
"screen_capturer_helper_unittest.cc",
"screen_capturer_mac_unittest.cc",
"screen_capturer_unittest.cc",
"test_utils.cc",
"test_utils.h",
"test_utils_unittest.cc",
"win/cursor_unittest.cc",
"win/cursor_unittest_resources.h",
"win/cursor_unittest_resources.rc",
"window_capturer_unittest.cc",
]
deps += [ ":desktop_capture_mock" ]

3
webrtc/webrtc.gni
View File

@ -10,6 +10,7 @@ import("//build/config/arm.gni")
import("//build/config/features.gni")
import("//build/config/mips.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build_overrides/build.gni")
import("//testing/test.gni")
@ -172,7 +173,7 @@ rtc_libyuv_dir = "//third_party/libyuv"
rtc_opus_dir = "//third_party/opus"
# Desktop capturer is supported only on Windows, OSX and Linux.
rtc_desktop_capture_supported = is_win || is_mac || is_linux
rtc_desktop_capture_supported = is_win || is_mac || (is_linux && use_x11)
###############################################################################
# Templates