generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restoring previous vie_auto_test.gypi structure due to problems on Mac

Browse Source 
Now the unit test is included in the vie_auto_test target and executed when the automated flag is used.

TBR=mflodman
BUG=
TEST=vie_auto_test --automated --gtest_filter=FrameDropPrimitivesTest.FixOutputFileForComparison

Review URL: https://webrtc-codereview.appspot.com/381003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1598 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2012-02-03 14:06:46 +00:00
parent 918a8bf40c
commit ce0a6ff43d
1 changed files with 102 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

231
src/video_engine/test/auto_test/vie_auto_test.gypi
View File

@ -12,17 +12,19 @@
'target_name': 'vie_auto_test',
'type': 'executable',
'dependencies': [
'vie_auto_test_lib',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/modules/modules.gyp:video_render_module',
'<(webrtc_root)/modules/modules.gyp:video_capture_module',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
'<(webrtc_root)/../testing/gtest.gyp:gtest',
'<(webrtc_root)/../third_party/google-gflags/google-gflags.gyp:google-gflags',
'<(webrtc_root)/../test/metrics.gyp:metrics',
'<(webrtc_root)/../test/test.gyp:test_support',
'video_engine_core',
],
'include_dirs': [
'interface',
'helpers',
'interface/',
'helpers/',
'primitives',
'../../include',
'../..',
@ -30,24 +32,117 @@
'../../../common_video/interface',
],
'sources': [
'source/vie_autotest_main.cc',
# Automated tests
'interface/tb_capture_device.h',
'interface/tb_external_transport.h',
'interface/tb_I420_codec.h',
'interface/tb_interfaces.h',
'interface/tb_video_channel.h',
'interface/vie_autotest.h',
'interface/vie_autotest_defines.h',
'interface/vie_autotest_linux.h',
'interface/vie_autotest_mac_carbon.h',
'interface/vie_autotest_mac_cocoa.h',
'interface/vie_autotest_main.h',
'interface/vie_autotest_window_manager_interface.h',
'interface/vie_autotest_windows.h',
'interface/vie_file_based_comparison_tests.h',
'interface/vie_window_manager_factory.h',
# Helper classes
'helpers/vie_fake_camera.cc',
'helpers/vie_fake_camera.h',
'helpers/vie_file_capture_device.cc',
'helpers/vie_file_capture_device.h',
'helpers/vie_to_file_renderer.cc',
'helpers/vie_to_file_renderer.h',
'helpers/vie_window_creator.cc',
'helpers/vie_window_creator.h',
# New, fully automated tests
'automated/vie_api_integration_test.cc',
'automated/vie_extended_integration_test.cc',
'automated/vie_integration_test_base.cc',
'automated/vie_integration_test_base.h',
'automated/vie_standard_integration_test.cc',
'automated/vie_video_verification_test.cc',
# Test primitives
'primitives/base_primitives.cc',
'primitives/base_primitives.h',
'primitives/codec_primitives.cc',
'primitives/codec_primitives.h',
'primitives/framedrop_primitives.h',
'primitives/framedrop_primitives.cc',
'primitives/framedrop_primitives_unittest.cc',
'primitives/general_primitives.cc',
'primitives/general_primitives.h',
# Platform independent
'source/tb_capture_device.cc',
'source/tb_external_transport.cc',
'source/tb_I420_codec.cc',
'source/tb_interfaces.cc',
'source/tb_video_channel.cc',
'source/vie_autotest.cc',
'source/vie_autotest_base.cc',
'source/vie_autotest_capture.cc',
'source/vie_autotest_codec.cc',
'source/vie_autotest_encryption.cc',
'source/vie_autotest_file.cc',
'source/vie_autotest_image_process.cc',
'source/vie_autotest_loopback.cc',
'source/vie_autotest_main.cc',
'source/vie_autotest_network.cc',
'source/vie_autotest_render.cc',
'source/vie_autotest_rtp_rtcp.cc',
'source/vie_autotest_custom_call.cc',
'source/vie_autotest_simulcast.cc',
'source/vie_file_based_comparison_tests.cc',
# Platform dependent
# Linux
'source/vie_autotest_linux.cc',
'source/vie_window_manager_factory_linux.cc',
# Mac
'source/vie_autotest_mac_cocoa.mm',
'source/vie_autotest_mac_carbon.cc',
'source/vie_autotest_windows.cc',
'source/vie_window_manager_factory_linux.cc',
'source/vie_window_manager_factory_mac.mm',
# Windows
'source/vie_autotest_windows.cc',
'source/vie_window_manager_factory_win.cc',
],
'copies': [{
'destination': '/tmp',
'files': [
'media/captureDeviceImage.bmp',
'media/captureDeviceImage.jpg',
'media/renderStartImage.bmp',
'media/renderStartImage.jpg',
'media/renderTimeoutImage.bmp',
'media/renderTimeoutImage.jpg',
],
}],
'conditions': [
# TODO(andrew): rename these to be suffixed with _mac and _win. They
# will then be automatically excluded.
['OS!="mac"', {
'sources!': [
'source/vie_autotest_mac_cocoa.cc',
'source/vie_autotest_mac_carbon.cc',
'source/vie_window_manager_factory_mac.mm',
],
}],
['OS!="win"', {
'sources!': [
'source/vie_autotest_windows.cc',
],
}],
['OS!="linux"', {
'sources!': [
'source/vie_window_manager_factory_linux.cc',
],
}],
# TODO(andrew): this likely isn't an actual dependency. It should be
# included in webrtc.gyp or video_engine.gyp instead.
['OS=="win"', {
@ -73,130 +168,8 @@
],
},
}],
# TODO(andrew): rename these to be suffixed with _mac and _win. They
# will then be automatically excluded.
['OS!="mac"', {
'sources!': [
'source/vie_autotest_mac_cocoa.cc',
'source/vie_autotest_mac_carbon.cc',
'source/vie_window_manager_factory_mac.mm',
],
}],
['OS!="win"', {
'sources!': [
'source/vie_autotest_windows.cc',
],
}],
['OS!="linux"', {
'sources!': [
'source/vie_window_manager_factory_linux.cc',
],
}],
], # conditions
},
{
'target_name': 'vie_auto_test_lib',
'type': '<(library)',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/modules/modules.gyp:video_render_module',
'<(webrtc_root)/modules/modules.gyp:video_capture_module',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
'<(webrtc_root)/../testing/gtest.gyp:gtest',
'<(webrtc_root)/../third_party/google-gflags/google-gflags.gyp:google-gflags',
'<(webrtc_root)/../test/metrics.gyp:metrics',
'<(webrtc_root)/../test/test.gyp:test_support',
'video_engine_core',
],
'include_dirs': [
'interface',
'helpers',
'primitives',
'../../include',
'../..',
'../../../modules/video_coding/codecs/interface',
'../../../common_video/interface',
],
'sources': [
'interface/tb_capture_device.h',
'interface/tb_external_transport.h',
'interface/tb_I420_codec.h',
'interface/tb_interfaces.h',
'interface/tb_video_channel.h',
'interface/vie_autotest.h',
'interface/vie_autotest_defines.h',
'interface/vie_autotest_linux.h',
'interface/vie_autotest_mac_carbon.h',
'interface/vie_autotest_mac_cocoa.h',
'interface/vie_autotest_main.h',
'interface/vie_autotest_window_manager_interface.h',
'interface/vie_autotest_windows.h',
'interface/vie_file_based_comparison_tests.h',
'interface/vie_window_manager_factory.h',
# Helper classes
'helpers/vie_fake_camera.cc',
'helpers/vie_fake_camera.h',
'helpers/vie_file_capture_device.cc',
'helpers/vie_file_capture_device.h',
'helpers/vie_to_file_renderer.cc',
'helpers/vie_to_file_renderer.h',
'helpers/vie_window_creator.cc',
'helpers/vie_window_creator.h',
# Test primitives
'primitives/base_primitives.cc',
'primitives/base_primitives.h',
'primitives/codec_primitives.cc',
'primitives/codec_primitives.h',
'primitives/framedrop_primitives.h',
'primitives/framedrop_primitives.cc',
'primitives/general_primitives.cc',
'primitives/general_primitives.h',
# Platform independent
'source/tb_capture_device.cc',
'source/tb_external_transport.cc',
'source/tb_I420_codec.cc',
'source/tb_interfaces.cc',
'source/tb_video_channel.cc',
'source/vie_autotest.cc',
'source/vie_autotest_base.cc',
'source/vie_autotest_capture.cc',
'source/vie_autotest_codec.cc',
'source/vie_autotest_encryption.cc',
'source/vie_autotest_file.cc',
'source/vie_autotest_image_process.cc',
'source/vie_autotest_loopback.cc',
'source/vie_autotest_main.cc',
'source/vie_autotest_network.cc',
'source/vie_autotest_render.cc',
'source/vie_autotest_rtp_rtcp.cc',
'source/vie_autotest_custom_call.cc',
'source/vie_autotest_simulcast.cc',
'source/vie_file_based_comparison_tests.cc',
],
'copies': [{
'destination': '/tmp',
'files': [
'media/captureDeviceImage.bmp',
'media/captureDeviceImage.jpg',
'media/renderStartImage.bmp',
'media/renderStartImage.jpg',
'media/renderTimeoutImage.bmp',
'media/renderTimeoutImage.jpg',
],
}],
},
{
'target_name': 'vie_auto_test_unittests',
'type': 'executable',
'dependencies': [
'vie_auto_test_lib',
'<(webrtc_root)/../test/test.gyp:test_support_main',
'<(webrtc_root)/../testing/gtest.gyp:gtest',
],
'sources': [
'primitives/framedrop_primitives_unittest.cc',
],
},
],
}