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

Move test to src/test.

Browse Source 
- Refer to top-level directories by <(DEPTH), e.g. <(DEPTH)/testing.
- Remove now unneeded third_party_root.

TBR=henrike@webrtc.org
BUG=none
TEST=trybots

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2446 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2012-06-27 01:41:54 +00:00
parent 253912c188
commit 81cf5e4752
73 changed files with 117 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/build/common.gypi
View File

@ -70,7 +70,6 @@
'include_tests%': 0,
'webrtc_root%': '<(DEPTH)/third_party/webrtc',
'third_party_root%': '<(DEPTH)/third_party',
}, {
# Settings for the standalone (not-in-Chromium) build.
@ -87,7 +86,6 @@
'include_tests%': 1,
'webrtc_root%': '<(DEPTH)/src',
'third_party_root%': '<(DEPTH)',
# TODO(andrew): For now, disable the Chrome plugins, which causes a
# flood of chromium-style warnings. Investigate enabling them:

4
src/common_audio/resampler/resampler.gypi
View File

@ -36,8 +36,8 @@
'type': 'executable',
'dependencies': [
'resampler',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'resampler_unittest.cc',

4
src/common_audio/signal_processing/signal_processing.gypi
View File

@ -66,8 +66,8 @@
'type': 'executable',
'dependencies': [
'signal_processing',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'signal_processing_unittest.cc',

4
src/common_audio/vad/vad.gypi
View File

@ -44,8 +44,8 @@
'type': 'executable',
'dependencies': [
'vad',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'vad_core_unittest.cc',

4
src/common_video/jpeg/jpeg.gypi
View File

@ -61,8 +61,8 @@
'type': 'executable',
'dependencies': [
'webrtc_jpeg',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'jpeg_unittest.cc',

4
src/common_video/libyuv/libyuv.gypi
View File

@ -40,9 +40,9 @@
'type': 'executable',
'dependencies': [
'webrtc_libyuv',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'libyuv_unittest.cc',

4
src/modules/audio_coding/codecs/cng/cng.gypi
View File

@ -38,8 +38,8 @@
'type': 'executable',
'dependencies': [
'CNG',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'cng_unittest.cc',

4
src/modules/audio_coding/codecs/g711/g711.gypi
View File

@ -35,8 +35,8 @@
'type': 'executable',
'dependencies': [
'G711',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'g711_unittest.cc',

4
src/modules/audio_coding/codecs/g722/g722.gypi
View File

@ -35,8 +35,8 @@
'type': 'executable',
'dependencies': [
'G722',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'g722_unittest.cc',

4
src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
View File

@ -33,8 +33,8 @@
'type': 'executable',
'dependencies': [
'PCM16B',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'pcm16b_unittest.cc',

8
src/modules/audio_coding/main/source/audio_coding_module.gypi
View File

@ -101,8 +101,8 @@
'type': 'executable',
'dependencies': [
'audio_coding_module',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
@ -131,8 +131,8 @@
'audio_coding_module',
'NetEq',
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [

16
src/modules/audio_coding/neteq/neteq.gypi
View File

@ -93,8 +93,8 @@
'dependencies': [
'NetEq',
'NetEqTestTools',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'webrtc_neteq_unittest.cc',
@ -178,7 +178,7 @@
'target_name': 'RTPjitter',
'type': 'executable',
'dependencies': [
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'test/RTPjitter.cc',
@ -189,7 +189,7 @@
'type': 'executable',
'dependencies': [
'NetEqTestTools',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'test/RTPanalyze.cc',
@ -200,7 +200,7 @@
'type': 'executable',
'dependencies': [
'NetEqTestTools',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'test/RTPchange.cc',
@ -211,7 +211,7 @@
'type': 'executable',
'dependencies': [
'NetEqTestTools',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'test/RTPtimeshift.cc',
@ -222,7 +222,7 @@
'type': 'executable',
'dependencies': [
'NetEqTestTools',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'test/RTPcat.cc',
@ -254,7 +254,7 @@
'iLBC',
'iSAC',
'CNG',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'direct_dependent_settings': {
'include_dirs': [

4
src/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
View File

@ -51,8 +51,8 @@
'type': 'executable',
'dependencies': [
'audio_conference_mixer',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [

8
src/modules/audio_device/main/source/audio_device.gypi
View File

@ -175,8 +175,8 @@
'dependencies': [
'audio_device',
'webrtc_utility',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
@ -192,8 +192,8 @@
'webrtc_utility',
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/test/test.gyp:test_support',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'../test/audio_device_test_func.cc',

8
src/modules/audio_processing/apm_tests.gypi
View File

@ -26,8 +26,8 @@
'audioproc_unittest_proto',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/test/test.gyp:test_support',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'aec/system_delay_unittest.cc',
@ -59,7 +59,7 @@
'audio_processing',
'audioproc_debug_proto',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [ 'test/process_test.cc', ],
},
@ -69,7 +69,7 @@
'dependencies': [
'audioproc_debug_proto',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/third_party/google-gflags/google-gflags.gyp:google-gflags',
'<(DEPTH)/third_party/google-gflags/google-gflags.gyp:google-gflags',
],
'sources': [ 'test/unpack.cc', ],
},

4
src/modules/bitrate_controller/bitrate_controller.gypi
View File

@ -41,8 +41,8 @@
'type': 'executable',
'dependencies': [
'bitrate_controller',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'bitrate_controller_unittest.cc',

4
src/modules/media_file/source/media_file.gypi
View File

@ -48,8 +48,8 @@
'type': 'executable',
'dependencies': [
'media_file',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'media_file_unittest.cc',

6
src/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
View File

@ -49,9 +49,9 @@
'type': 'executable',
'dependencies': [
'remote_bitrate_estimator',
'<(third_party_root)/testing/gmock.gyp:gmock',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'include/mock/mock_remote_bitrate_observer.h',

6
src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
View File

@ -13,9 +13,9 @@
'type': 'executable',
'dependencies': [
'rtp_rtcp',
'<(third_party_root)/testing/gmock.gyp:gmock',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [

4
src/modules/rtp_rtcp/test/testAPI/test_api.gypi
View File

@ -13,8 +13,8 @@
'type': 'executable',
'dependencies': [
'rtp_rtcp',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'include_dirs': [

2
src/modules/rtp_rtcp/test/testFec/test_fec.gypi
View File

@ -13,7 +13,7 @@
'type': 'executable',
'dependencies': [
'rtp_rtcp',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'include_dirs': [

6
src/modules/udp_transport/source/udp_transport.gypi
View File

@ -88,9 +88,9 @@
'type': 'executable',
'dependencies': [
'udp_transport',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/testing/gmock.gyp:gmock',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'udp_transport_unittest.cc',

4
src/modules/utility/source/utility.gypi
View File

@ -75,8 +75,8 @@
'type': 'executable',
'dependencies': [
'webrtc_utility',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'audio_frame_operations_unittest.cc',

4
src/modules/video_capture/main/source/video_capture.gypi
View File

@ -141,8 +141,8 @@
'video_capture_module',
'webrtc_utility',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'include_dirs': [
'../interface',

12
src/modules/video_coding/codecs/test/video_codecs_test_framework.gypi
View File

@ -14,7 +14,7 @@
'target_name': 'video_codecs_test_framework',
'type': '<(library)',
'dependencies': [
'<(third_party_root)/test/test.gyp:test_support',
'<(webrtc_root)/test/test.gyp:test_support',
],
'sources': [
'mock/mock_packet_manipulator.h',
@ -35,8 +35,8 @@
'video_codecs_test_framework',
'webrtc_video_coding',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/testing/gmock.gyp:gmock',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'packet_manipulator_unittest.cc',
@ -51,9 +51,9 @@
'video_codecs_test_framework',
'webrtc_video_coding',
'webrtc_vp8',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/metrics.gyp:metrics',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/metrics.gyp:metrics',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'videoprocessor_integrationtest.cc',

8
src/modules/video_coding/codecs/test_framework/test_framework.gypi
View File

@ -15,16 +15,16 @@
'type': '<(library)',
'dependencies': [
'<(third_party_root)/test/metrics.gyp:metrics',
'<(third_party_root)/test/test.gyp:test_support',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/metrics.gyp:metrics',
'<(webrtc_root)/test/test.gyp:test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/common_video/common_video.gyp:webrtc_libyuv',
],
'include_dirs': [
'../interface',
'<(third_party_root)/testing/gtest/include',
'<(DEPTH)/testing/gtest/include',
'../../../../common_video/interface',
],

4
src/modules/video_coding/codecs/tools/video_codecs_tools.gypi
View File

@ -17,8 +17,8 @@
'video_codecs_test_framework',
'webrtc_video_coding',
'webrtc_vp8',
'<(third_party_root)/test/metrics.gyp:metrics',
'<(third_party_root)/third_party/google-gflags/google-gflags.gyp:google-gflags',
'<(webrtc_root)/test/metrics.gyp:metrics',
'<(DEPTH)/third_party/google-gflags/google-gflags.gyp:google-gflags',
],
'sources': [
'video_quality_measurement.cc',

18
src/modules/video_coding/codecs/vp8/main/source/vp8.gypi
View File

@ -24,14 +24,14 @@
'conditions': [
['build_with_chromium==1', {
'dependencies': [
'<(third_party_root)/libvpx/libvpx.gyp:libvpx',
'<(DEPTH)/libvpx/libvpx.gyp:libvpx',
],
'defines': [
'WEBRTC_LIBVPX_VERSION=960' # Bali
],
},{
'dependencies': [
'<(third_party_root)/third_party/libvpx/libvpx.gyp:libvpx',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
],
'defines': [
'WEBRTC_LIBVPX_VERSION=971' # Cayuga
@ -69,9 +69,9 @@
'webrtc_vp8',
'<(webrtc_root)/common_video/common_video.gyp:webrtc_libyuv',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/test/test.gyp:test_support',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
# header files
@ -96,13 +96,13 @@
'target_name': 'vp8_unittests',
'type': 'executable',
'dependencies': [
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/third_party/libvpx/libvpx.gyp:libvpx',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
'webrtc_vp8',
],
'include_dirs': [
'<(third_party_root)/third_party/libvpx/source/libvpx',
'<(DEPTH)/third_party/libvpx/source/libvpx',
],
'sources': [
'reference_picture_selection_unittest.cc',

12
src/modules/video_coding/main/source/video_coding_test.gypi
View File

@ -11,9 +11,9 @@
'target_name': 'video_coding_test',
'type': 'executable',
'dependencies': [
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support',
'<(third_party_root)/test/metrics.gyp:metrics',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/test/metrics.gyp:metrics',
'webrtc_video_coding',
'rtp_rtcp',
'webrtc_utility',
@ -68,9 +68,9 @@
'type': 'executable',
'dependencies': [
'webrtc_video_coding',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [

4
src/modules/video_processing/main/test/vpm_tests.gypi
View File

@ -14,8 +14,8 @@
'dependencies': [
'video_processing',
'webrtc_utility',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
# headers

4
src/system_wrappers/source/system_wrappers.gyp
View File

@ -181,8 +181,8 @@
'type': 'executable',
'dependencies': [
'system_wrappers',
'<(webrtc_root)/../testing/gtest.gyp:gtest',
'<(webrtc_root)/../test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'condition_variable_unittest.cc',

0
test/OWNERS → src/test/OWNERS
View File

0
test/linux/v4l2_file_player/Makefile → src/test/linux/v4l2_file_player/Makefile
View File

0
test/linux/v4l2_file_player/README → src/test/linux/v4l2_file_player/README
View File

0
test/linux/v4l2_file_player/v4l2_file_player.c → src/test/linux/v4l2_file_player/v4l2_file_player.c
View File

0
test/manual/README → src/test/manual/README
View File

0
test/manual/audio-and-video.html → src/test/manual/audio-and-video.html
View File

0
test/manual/iframe-video.html → src/test/manual/iframe-video.html
View File

0
test/manual/multiple-audio.html → src/test/manual/multiple-audio.html
View File

0
test/manual/multiple-video.html → src/test/manual/multiple-video.html
View File

0
test/manual/single-audio.html → src/test/manual/single-audio.html
View File

0
test/manual/single-video.html → src/test/manual/single-video.html
View File

0
test/manual/two-video-devices.html → src/test/manual/two-video-devices.html
View File

6
test/metrics.gyp → src/test/metrics.gyp
View File

@ -8,7 +8,7 @@
{
'includes': [
'../src/build/common.gypi',
'../build/common.gypi',
],
'targets': [
{
@ -35,8 +35,8 @@
'type': 'executable',
'dependencies': [
'metrics',
'<(webrtc_root)/../test/test.gyp:test_support_main',
'<(webrtc_root)/../testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'testsupport/metrics/video_metrics_unittest.cc',

0
test/run_all_unittests.cc → src/test/run_all_unittests.cc
View File

8
test/test.gyp → src/test/test.gyp
View File

@ -9,7 +9,7 @@
# TODO(andrew): consider moving test_support to src/base/test.
{
'includes': [
'../src/build/common.gypi',
'../build/common.gypi',
],
'targets': [
{
@ -24,8 +24,8 @@
],
},
'dependencies': [
'<(webrtc_root)/../testing/gtest.gyp:gtest',
'<(webrtc_root)/../testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
],
'all_dependent_settings': {
'include_dirs': [
@ -65,7 +65,7 @@
'type': 'executable',
'dependencies': [
'test_support_main',
'<(webrtc_root)/../testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'testsupport/unittest_utils.h',

0
test/test_suite.cc → src/test/test_suite.cc
View File

0
test/test_suite.h → src/test/test_suite.h
View File

0
test/testsupport/fileutils.cc → src/test/testsupport/fileutils.cc
View File

0
test/testsupport/fileutils.h → src/test/testsupport/fileutils.h
View File

0
test/testsupport/fileutils_unittest.cc → src/test/testsupport/fileutils_unittest.cc
View File

0
test/testsupport/frame_reader.cc → src/test/testsupport/frame_reader.cc
View File

0
test/testsupport/frame_reader.h → src/test/testsupport/frame_reader.h
View File

0
test/testsupport/frame_reader_unittest.cc → src/test/testsupport/frame_reader_unittest.cc
View File

0
test/testsupport/frame_writer.cc → src/test/testsupport/frame_writer.cc
View File

0
test/testsupport/frame_writer.h → src/test/testsupport/frame_writer.h
View File

0
test/testsupport/frame_writer_unittest.cc → src/test/testsupport/frame_writer_unittest.cc
View File

0
test/testsupport/gtest_prod_util.h → src/test/testsupport/gtest_prod_util.h
View File

0
test/testsupport/metrics/video_metrics.cc → src/test/testsupport/metrics/video_metrics.cc
View File

0
test/testsupport/metrics/video_metrics.h → src/test/testsupport/metrics/video_metrics.h
View File

0
test/testsupport/metrics/video_metrics_unittest.cc → src/test/testsupport/metrics/video_metrics_unittest.cc
View File

0
test/testsupport/mock/mock_frame_reader.h → src/test/testsupport/mock/mock_frame_reader.h
View File

0
test/testsupport/mock/mock_frame_writer.h → src/test/testsupport/mock/mock_frame_writer.h
View File

0
test/testsupport/packet_reader.cc → src/test/testsupport/packet_reader.cc
View File

0
test/testsupport/packet_reader.h → src/test/testsupport/packet_reader.h
View File

0
test/testsupport/packet_reader_unittest.cc → src/test/testsupport/packet_reader_unittest.cc
View File

0
test/testsupport/unittest_utils.h → src/test/testsupport/unittest_utils.h
View File

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

@ -16,10 +16,10 @@
'<(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',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/third_party/google-gflags/google-gflags.gyp:google-gflags',
'<(third_party_root)/test/metrics.gyp:metrics',
'<(third_party_root)/test/test.gyp:test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/google-gflags/google-gflags.gyp:google-gflags',
'<(webrtc_root)/test/metrics.gyp:metrics',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/test/libtest/libtest.gyp:libtest',
'video_engine_core',
'libvietest',

4
src/video_engine/test/libvietest/libvietest.gypi
View File

@ -12,8 +12,8 @@
'type': '<(library)',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support',
'video_engine_core',
],
'direct_dependent_settings': {

6
src/video_engine/video_engine_core.gypi
View File

@ -138,9 +138,9 @@
'type': 'executable',
'dependencies': [
'video_engine_core',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/testing/gmock.gyp:gmock',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'include_dirs': [
'..',

4
src/voice_engine/main/source/voice_engine_core.gypi
View File

@ -120,8 +120,8 @@
'type': 'executable',
'dependencies': [
'voice_engine_core',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',
# The rest are to satisfy the channel_unittest include chain.
# This would be unnecessary if we had qualified includes.
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',

12
src/voice_engine/main/test/voice_engine_tests.gypi
View File

@ -15,9 +15,9 @@
'dependencies': [
'voice_engine_core',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/test/test.gyp:test_support',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(third_party_root)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/libtest/libtest.gyp:libtest',
],
'include_dirs': [
@ -93,8 +93,8 @@
'target_name': 'voe_cmd_test',
'type': 'executable',
'dependencies': [
'<(third_party_root)/test/test.gyp:test_support',
'<(third_party_root)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
'voice_engine_core',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
@ -113,7 +113,7 @@
'dependencies': [
'voice_engine_core',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(third_party_root)/test/test.gyp:test_support',
'<(webrtc_root)/test/test.gyp:test_support',
],
'include_dirs': [
'win_test',

4
webrtc.gyp
View File

@ -19,8 +19,8 @@
'src/system_wrappers/source/system_wrappers.gyp:*',
'src/video_engine/video_engine.gyp:*',
'src/voice_engine/voice_engine.gyp:*',
'test/metrics.gyp:*',
'test/test.gyp:*',
'src/test/metrics.gyp:*',
'src/test/test.gyp:*',
'tools/e2e_quality/e2e_quality.gyp:*',
],
},