From 6f27633f47d0192f7cb04852be0988013e6c19dd Mon Sep 17 00:00:00 2001 From: mbonadei Date: Wed, 19 Apr 2017 02:58:33 -0700 Subject: [PATCH] Reland of Enabling 'gn check' on //webrtc/test. (patchset #1 id:1 of https://codereview.webrtc.org/2817003002/ ) Reason for revert: The original CL was breaking a downstream buildbot: https://build.chromium.org/p/client.webrtc/builders/Linux64%20Release%20%28Libfuzzer%29/builds/5429 This CL fixes some dependencies in: webrtc/test/fuzzers/BUILD.gn (PS #2 and PS #3). BUG=webrtc:6828 Original issue's description: > Revert of Enabling 'gn check' on //webrtc/test. (patchset #10 id:180001 of https://codereview.webrtc.org/2796363003/ ) > > Reason for revert: > It is breaking a downstream bot. > > Original issue's description: > > Enabling 'gn check' on //webrtc/test. > > > > BUG=webrtc:6828 > > NOTRY=True > > > > Review-Url: https://codereview.webrtc.org/2796363003 > > Cr-Commit-Position: refs/heads/master@{#17689} > > Committed: https://chromium.googlesource.com/external/webrtc/+/b41445858e23fb757e5e10ac5631aa80e9e5eea9 > > TBR=kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6828 > > Review-Url: https://codereview.webrtc.org/2817003002 > Cr-Commit-Position: refs/heads/master@{#17690} > Committed: https://chromium.googlesource.com/external/webrtc/+/8a24f47bad6eebb0fba10c3bbdb9556e43e19379 Review-Url: https://codereview.webrtc.org/2815103005 Cr-Commit-Position: refs/heads/master@{#17758} --- .gn | 1 + webrtc/test/BUILD.gn | 58 +++++++++++++++++++++++++++++++++++- webrtc/test/fuzzers/BUILD.gn | 45 +++++++++++++++++++++------- 3 files changed, 93 insertions(+), 11 deletions(-) diff --git a/.gn b/.gn index 0491e43867..a1fca6d036 100644 --- a/.gn +++ b/.gn @@ -34,6 +34,7 @@ check_targets = [ "//webrtc/ortc/*", "//webrtc/stats/*", "//webrtc/tools/*", + "//webrtc/test/*", "//webrtc/voice_engine/*", ] diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 9554ccf2f9..64b6e03919 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -53,9 +53,13 @@ rtc_source_set("video_test_common") { } deps = [ + "..:webrtc_common", + "../base:rtc_base_approved", + "../base:rtc_task_queue", "../common_video", "../media:rtc_media_base", "../modules/video_capture:video_capture_module", + "../system_wrappers", ] } @@ -77,6 +81,7 @@ rtc_source_set("rtp_test_utils") { deps = [ "..:webrtc_common", + "../base:rtc_base_approved", "../modules/rtp_rtcp", "//testing/gtest", ] @@ -107,6 +112,7 @@ rtc_source_set("test_main") { ] deps = [ ":field_trial", + "../base:rtc_base_approved", "../system_wrappers:metrics_default", "//testing/gmock", "//testing/gtest", @@ -125,6 +131,16 @@ rtc_source_set("fileutils") { configs += [ "//build/config/compiler:enable_arc" ] } visibility = [ ":*" ] + deps = [ + "..:webrtc_common", + "../base:rtc_base_approved", + ] + if (is_ios) { + deps += [ "../sdk:rtc_sdk_common_objc" ] + } + if (is_win) { + deps += [ "../base:rtc_base" ] + } } rtc_source_set("video_test_support") { @@ -143,6 +159,9 @@ rtc_source_set("video_test_support") { ] deps = [ + ":test_support", + ":video_test_common", + "..:webrtc_common", "../base:rtc_base_approved", "../common_video", "../system_wrappers", @@ -191,6 +210,7 @@ rtc_source_set("test_support") { ] deps = [ + "..:webrtc_common", "../base:gtest_prod", "../base:rtc_base_approved", "../common_video", @@ -296,12 +316,20 @@ rtc_test("test_support_unittests") { deps += [ ":direct_transport", + ":fake_audio_device", ":fileutils_unittests", + ":rtp_test_utils", ":test_common", ":test_main", ":video_test_common", ":video_test_support", + "../api:video_frame_api", + "../base:rtc_base_approved", + "../call:call_interfaces", + "../common_audio", + "../modules/rtp_rtcp", "../modules/video_capture", + "../system_wrappers", "//testing/gmock", "//testing/gtest", "//third_party/gflags", @@ -314,6 +342,7 @@ rtc_source_set("fileutils_unittests") { ] deps = [ ":fileutils", + ":test_support", "//testing/gmock", "//testing/gtest", ] @@ -332,9 +361,12 @@ rtc_source_set("direct_transport") { suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] } deps = [ + "..:webrtc_common", "../api:transport_api", "../base:rtc_base_approved", "../call", + "../modules/rtp_rtcp", + "../system_wrappers", ] } @@ -349,8 +381,11 @@ rtc_source_set("fake_audio_device") { suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] } deps = [ + "..:webrtc_common", "../base:rtc_base_approved", - "../modules/audio_device:audio_device", + "../common_audio", + "../modules/audio_device", + "../system_wrappers", ] } @@ -403,13 +438,25 @@ rtc_source_set("test_common") { ":test_support", ":video_test_common", "..:webrtc_common", + "../api:transport_api", + "../api:video_frame_api", + "../api/audio_codecs:builtin_audio_decoder_factory", "../api/video_codecs:video_codecs_api", "../audio", "../base:rtc_base_approved", + "../base:rtc_task_queue", "../call", + "../logging:rtc_event_log_api", + "../modules/audio_device:mock_audio_device", "../modules/audio_mixer:audio_mixer_impl", "../modules/audio_processing", + "../modules/rtp_rtcp:rtp_rtcp", + "../modules/video_coding:webrtc_h264", + "../modules/video_coding:webrtc_vp8", + "../modules/video_coding:webrtc_vp9", + "../system_wrappers", "../video", + "../voice_engine", "//testing/gmock", "//testing/gtest", ] @@ -485,6 +532,9 @@ rtc_source_set("test_renderer") { deps = [ ":test_support", + "..:webrtc_common", + "../base:rtc_base_approved", + "../common_video", "../modules/media_file", "//testing/gtest", ] @@ -496,4 +546,10 @@ rtc_source_set("audio_codec_mocks") { "mock_audio_decoder.h", "mock_audio_decoder_factory.h", ] + deps = [ + ":test_support", + "../api/audio_codecs:audio_codecs_api", + "../api/audio_codecs:builtin_audio_decoder_factory", + "../base:rtc_base_approved", + ] } diff --git a/webrtc/test/fuzzers/BUILD.gn b/webrtc/test/fuzzers/BUILD.gn index 031ed8b342..ed84e48833 100644 --- a/webrtc/test/fuzzers/BUILD.gn +++ b/webrtc/test/fuzzers/BUILD.gn @@ -15,6 +15,7 @@ rtc_static_library("webrtc_fuzzer_main") { "webrtc_fuzzer_main.cc", ] deps = [ + "../../base:rtc_base_approved", "../../system_wrappers:field_trial_default", "../../system_wrappers:metrics_default", "//testing/libfuzzer:libfuzzer_main", @@ -64,6 +65,7 @@ webrtc_fuzzer_test("vp8_qp_parser_fuzzer") { "vp8_qp_parser_fuzzer.cc", ] deps = [ + "../../modules/video_coding:video_coding_utility", "../../modules/video_coding/", ] } @@ -73,6 +75,7 @@ webrtc_fuzzer_test("h264_bitstream_parser_fuzzer") { "h264_bitstream_parser_fuzzer.cc", ] deps = [ + "../../common_video", "../../modules/video_coding/", ] } @@ -82,7 +85,8 @@ webrtc_fuzzer_test("flexfec_header_reader_fuzzer") { "flexfec_header_reader_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../base:rtc_base_approved", + "../../modules/rtp_rtcp", ] } @@ -91,7 +95,8 @@ webrtc_fuzzer_test("flexfec_sender_fuzzer") { "flexfec_sender_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../modules/rtp_rtcp", + "../../system_wrappers", ] libfuzzer_options = [ "max_len=200" ] } @@ -101,7 +106,8 @@ webrtc_fuzzer_test("ulpfec_header_reader_fuzzer") { "ulpfec_header_reader_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../base:rtc_base_approved", + "../../modules/rtp_rtcp", ] } @@ -110,7 +116,9 @@ webrtc_fuzzer_test("ulpfec_generator_fuzzer") { "ulpfec_generator_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../base:rtc_base_approved", + "../../modules/rtp_rtcp", + "../../modules/rtp_rtcp:rtp_rtcp_unittests", ] } @@ -119,7 +127,8 @@ webrtc_fuzzer_test("flexfec_receiver_fuzzer") { "flexfec_receiver_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../base:rtc_base_approved", + "../../modules/rtp_rtcp", ] libfuzzer_options = [ "max_len=2000" ] } @@ -129,7 +138,8 @@ webrtc_fuzzer_test("packet_buffer_fuzzer") { "packet_buffer_fuzzer.cc", ] deps = [ - "../../modules/video_coding/", + "../../modules/video_coding", + "../../system_wrappers", ] libfuzzer_options = [ "max_len=2000" ] } @@ -139,7 +149,9 @@ webrtc_fuzzer_test("rtcp_receiver_fuzzer") { "rtcp_receiver_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../base:rtc_base_approved", + "../../modules/rtp_rtcp", + "../../system_wrappers", ] seed_corpus = "corpora/rtcp-corpus" } @@ -149,7 +161,7 @@ webrtc_fuzzer_test("rtp_packet_fuzzer") { "rtp_packet_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../modules/rtp_rtcp", ] seed_corpus = "corpora/rtp-corpus" } @@ -159,7 +171,7 @@ webrtc_fuzzer_test("rtp_header_fuzzer") { "rtp_header_fuzzer.cc", ] deps = [ - "../../modules/rtp_rtcp/", + "../../modules/rtp_rtcp", ] } @@ -168,8 +180,11 @@ webrtc_fuzzer_test("congestion_controller_feedback_fuzzer") { "congestion_controller_feedback_fuzzer.cc", ] deps = [ + "../../logging:rtc_event_log_api", "../../logging:rtc_event_log_impl", - "../../modules/congestion_controller/", + "../../modules/congestion_controller", + "../../modules/remote_bitrate_estimator", + "../../modules/rtp_rtcp", ] } @@ -178,6 +193,12 @@ rtc_static_library("audio_decoder_fuzzer") { "audio_decoder_fuzzer.cc", "audio_decoder_fuzzer.h", ] + deps = [ + "../..:webrtc_common", + "../../api/audio_codecs:audio_codecs_api", + "../../base:rtc_base_approved", + "../../modules/rtp_rtcp", + ] } webrtc_fuzzer_test("audio_decoder_ilbc_fuzzer") { @@ -254,8 +275,10 @@ webrtc_fuzzer_test("neteq_rtp_fuzzer") { "neteq_rtp_fuzzer.cc", ] deps = [ + "../../base:rtc_base_approved", "../../modules/audio_coding:neteq", "../../modules/audio_coding:neteq_test_minimal", + "../../modules/audio_coding:neteq_unittest_tools", "../../modules/audio_coding:pcm16b", "../../modules/rtp_rtcp", ] @@ -298,6 +321,7 @@ webrtc_fuzzer_test("pseudotcp_parser_fuzzer") { "pseudotcp_parser_fuzzer.cc", ] deps = [ + "../../base:rtc_base", "../../p2p:rtc_p2p", ] } @@ -307,6 +331,7 @@ webrtc_fuzzer_test("transport_feedback_packet_loss_tracker_fuzzer") { "transport_feedback_packet_loss_tracker_fuzzer.cc", ] deps = [ + "../../base:rtc_base_approved", "../../modules/rtp_rtcp", "../../voice_engine", ]