3365422c41
This is a re-land attempt of http://review.webrtc.org/1673004/ It now includes a build/isolate.gypi in WebRTC that includes the same file as the one that would be included when WebRTC is used in a Chromium checkout. It is needed since it is not possible to use variables in GYP's includes sections. Implemented according to the instructions at http://www.chromium.org/developers/testing/isolated-testing Workflow has been like this: 1. create _run GYP target 2. create a stripped down .isolate file 3. export GYP_DEFINES="$GYP_DEFINES test_isolation_mode=check" 4. runhooks 5. compile 6. test if the test would run (i.e. find it's dependencies) without actually executing it: tools/swarm_client/isolate.py run --isolated out/Release/testname.isolated 7. If failing, run the fix_test_cases.py script like this: tools/swarm_client/googletest/fix_test_cases.py --isolated out/Release/testname.isolated All tests that run on the bots for WebRTC has got _run target and .isolate file created. "Normal tests" that run fine on any machine: * audio_decoder_unittests * common_audio_unittests * common_video_unittests * metrics_unittests * modules_tests * modules_unittests * neteq_unittests * system_wrappers_unittests * test_support_unittests * tools_unittests * video_engine_core_unittests * voice_engine_unittests Tests that requires bare-metal and audio/video devices: * audio_device_tests * video_capture_tests I also added the isolate boilerplate code for the following tests that are not yet pure gtest binaries (which means they cannot run isolated yet): * video_render_tests * vie_auto_test * voe_auto_test TEST=running isolate.py as described above. WebRTC trybots passing. Created a Chromium checkout with third_party/webrtc ToT and this patch applied, passing the runhooks step. BUG=1916 R=henrike@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2056004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4590 4adac7df-926f-26a2-2b94-8c16560cd09d
227 lines
7.9 KiB
Python
227 lines
7.9 KiB
Python
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'video_render_module',
|
|
'type': 'static_library',
|
|
'dependencies': [
|
|
'webrtc_utility',
|
|
'<(webrtc_root)/common_video/common_video.gyp:common_video',
|
|
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
],
|
|
'include_dirs': [
|
|
'include',
|
|
'../interface',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'include',
|
|
'../interface',
|
|
],
|
|
},
|
|
'sources': [
|
|
'android/video_render_android_impl.cc',
|
|
'android/video_render_android_impl.h',
|
|
'android/video_render_android_native_opengl2.cc',
|
|
'android/video_render_android_native_opengl2.h',
|
|
'android/video_render_android_surface_view.cc',
|
|
'android/video_render_android_surface_view.h',
|
|
'android/video_render_opengles20.cc',
|
|
'android/video_render_opengles20.h',
|
|
'external/video_render_external_impl.cc',
|
|
'external/video_render_external_impl.h',
|
|
'i_video_render.h',
|
|
'include/video_render.h',
|
|
'include/video_render_defines.h',
|
|
'incoming_video_stream.cc',
|
|
'incoming_video_stream.h',
|
|
'linux/video_render_linux_impl.cc',
|
|
'linux/video_render_linux_impl.h',
|
|
'linux/video_x11_channel.cc',
|
|
'linux/video_x11_channel.h',
|
|
'linux/video_x11_render.cc',
|
|
'linux/video_x11_render.h',
|
|
'mac/cocoa_full_screen_window.mm',
|
|
'mac/cocoa_full_screen_window.h',
|
|
'mac/cocoa_render_view.mm',
|
|
'mac/cocoa_render_view.h',
|
|
'mac/video_render_agl.cc',
|
|
'mac/video_render_agl.h',
|
|
'mac/video_render_mac_carbon_impl.cc',
|
|
'mac/video_render_mac_carbon_impl.h',
|
|
'mac/video_render_mac_cocoa_impl.h',
|
|
'mac/video_render_mac_cocoa_impl.mm',
|
|
'mac/video_render_nsopengl.h',
|
|
'mac/video_render_nsopengl.mm',
|
|
'video_render_frames.cc',
|
|
'video_render_frames.h',
|
|
'video_render_impl.cc',
|
|
'video_render_impl.h',
|
|
'windows/i_video_render_win.h',
|
|
'windows/video_render_direct3d9.cc',
|
|
'windows/video_render_direct3d9.h',
|
|
'windows/video_render_windows_impl.cc',
|
|
'windows/video_render_windows_impl.h',
|
|
],
|
|
# TODO(andrew): with the proper suffix, these files will be excluded
|
|
# automatically.
|
|
'conditions': [
|
|
['include_internal_video_render==1', {
|
|
'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',],
|
|
}],
|
|
['OS!="android" or include_internal_video_render==0', {
|
|
'sources!': [
|
|
'android/video_render_android_impl.h',
|
|
'android/video_render_android_native_opengl2.h',
|
|
'android/video_render_android_surface_view.h',
|
|
'android/video_render_opengles20.h',
|
|
'android/video_render_android_impl.cc',
|
|
'android/video_render_android_native_opengl2.cc',
|
|
'android/video_render_android_surface_view.cc',
|
|
'android/video_render_opengles20.cc',
|
|
],
|
|
}],
|
|
['OS!="linux" or include_internal_video_render==0', {
|
|
'sources!': [
|
|
'linux/video_render_linux_impl.h',
|
|
'linux/video_x11_channel.h',
|
|
'linux/video_x11_render.h',
|
|
'linux/video_render_linux_impl.cc',
|
|
'linux/video_x11_channel.cc',
|
|
'linux/video_x11_render.cc',
|
|
],
|
|
}],
|
|
['OS!="mac" or include_internal_video_render==0', {
|
|
'sources!': [
|
|
'mac/cocoa_full_screen_window.h',
|
|
'mac/cocoa_render_view.h',
|
|
'mac/video_render_agl.h',
|
|
'mac/video_render_mac_carbon_impl.h',
|
|
'mac/video_render_mac_cocoa_impl.h',
|
|
'mac/video_render_nsopengl.h',
|
|
'mac/video_render_nsopengl.mm',
|
|
'mac/video_render_mac_cocoa_impl.mm',
|
|
'mac/video_render_agl.cc',
|
|
'mac/video_render_mac_carbon_impl.cc',
|
|
'mac/cocoa_render_view.mm',
|
|
'mac/cocoa_full_screen_window.mm',
|
|
],
|
|
}],
|
|
['OS=="mac"', {
|
|
'direct_dependent_settings': {
|
|
'include_dirs': ['mac',],
|
|
},
|
|
}],
|
|
['OS=="win" and include_internal_video_render==1', {
|
|
'variables': {
|
|
# 'directx_sdk_path' will be overridden in the condition block
|
|
# below, but it must not be declared as empty here since gyp
|
|
# will check if the first character is '/' for some reason.
|
|
# If it's empty, we'll get an out-of-bounds error.
|
|
'directx_sdk_path': 'will_be_overridden',
|
|
'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
|
|
'conditions': [
|
|
['"<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
|
|
'directx_sdk_path': '<(DEPTH)/third_party/directxsdk/files',
|
|
}, {
|
|
'directx_sdk_path': '$(DXSDK_DIR)',
|
|
}],
|
|
],
|
|
},
|
|
|
|
'include_dirs': [
|
|
'<(directx_sdk_path)/Include',
|
|
],
|
|
}],
|
|
['OS!="win" or include_internal_video_render==0', {
|
|
'sources!': [
|
|
'windows/i_video_render_win.h',
|
|
'windows/video_render_direct3d9.h',
|
|
'windows/video_render_windows_impl.h',
|
|
'windows/video_render_direct3d9.cc',
|
|
'windows/video_render_windows_impl.cc',
|
|
],
|
|
}],
|
|
] # conditions
|
|
}, # video_render_module
|
|
], # targets
|
|
|
|
'conditions': [
|
|
['include_internal_video_render==1', {
|
|
'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',],
|
|
}],
|
|
['include_tests==1', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'video_render_tests',
|
|
'type': 'executable',
|
|
'dependencies': [
|
|
'video_render_module',
|
|
'webrtc_utility',
|
|
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
'<(webrtc_root)/common_video/common_video.gyp:common_video',
|
|
],
|
|
'sources': [
|
|
'test/testAPI/testAPI.cc',
|
|
'test/testAPI/testAPI.h',
|
|
'test/testAPI/testAPI_android.cc',
|
|
'test/testAPI/testAPI_mac.mm',
|
|
],
|
|
'conditions': [
|
|
['OS=="mac" or OS=="linux"', {
|
|
'cflags': [
|
|
'-Wno-write-strings',
|
|
],
|
|
'ldflags': [
|
|
'-lpthread -lm',
|
|
],
|
|
}],
|
|
['OS=="linux"', {
|
|
'libraries': [
|
|
'-lrt',
|
|
'-lXext',
|
|
'-lX11',
|
|
],
|
|
}],
|
|
['OS=="mac"', {
|
|
'xcode_settings': {
|
|
'OTHER_LDFLAGS': [
|
|
'-framework Foundation -framework AppKit -framework Cocoa -framework OpenGL',
|
|
],
|
|
},
|
|
}],
|
|
] # conditions
|
|
}, # video_render_module_test
|
|
], # targets
|
|
'conditions': [
|
|
['test_isolation_mode != "noop"', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'video_render_tests_run',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'<(import_isolate_path):import_isolate_gypi',
|
|
'video_render_tests',
|
|
],
|
|
'includes': [
|
|
'video_render_tests.isolate',
|
|
],
|
|
'sources': [
|
|
'video_render_tests.isolate',
|
|
],
|
|
},
|
|
],
|
|
}],
|
|
],
|
|
}], # include_tests==0
|
|
], # conditions
|
|
}
|
|
|