Skip to content

Commit b80ef8c

Browse files
MirkoBonadeiCommit bot
MirkoBonadei
authored and
Commit bot
committed
Revert of Enabling 'gn check' on //webrtc/test. (patchset #3 id:90001 of https://codereview.webrtc.org/2815103005/ )
Reason for revert: Breaks Chromium because in Chromium we import WebRTC with rtc_include_tests=false (https://bugs.chromium.org/p/chromium/issues/detail?id=713179#c6). Chromium uses webrtc/test/fuzzers and this CL adds test dependencies to neteq_rtc_fuzzer. Original issue's description: > 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 > > > > [email protected] > > # 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} > Committed: https://chromium.googlesource.com/external/webrtc/+/6f27633f47d0192f7cb04852be0988013e6c19dd [email protected] # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:6828 NOTRY=True Review-Url: https://codereview.webrtc.org/2842533002 Cr-Commit-Position: refs/heads/master@{#17851}
1 parent a115a4b commit b80ef8c

File tree

3 files changed

+11
-93
lines changed

3 files changed

+11
-93
lines changed

‎.gn

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ check_targets = [
3737
"//webrtc/stats/*",
3838
"//webrtc/system_wrappers/*",
3939
"//webrtc/tools/*",
40-
"//webrtc/test/*",
4140
"//webrtc/voice_engine/*",
4241
]
4342

‎webrtc/test/BUILD.gn

+1-57
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,9 @@ rtc_source_set("video_test_common") {
5353
}
5454

5555
deps = [
56-
"..:webrtc_common",
57-
"../base:rtc_base_approved",
58-
"../base:rtc_task_queue",
5956
"../common_video",
6057
"../media:rtc_media_base",
6158
"../modules/video_capture:video_capture_module",
62-
"../system_wrappers",
6359
]
6460
}
6561

@@ -81,7 +77,6 @@ rtc_source_set("rtp_test_utils") {
8177

8278
deps = [
8379
"..:webrtc_common",
84-
"../base:rtc_base_approved",
8580
"../modules/rtp_rtcp",
8681
"//testing/gtest",
8782
]
@@ -112,7 +107,6 @@ rtc_source_set("test_main") {
112107
]
113108
deps = [
114109
":field_trial",
115-
"../base:rtc_base_approved",
116110
"../system_wrappers:metrics_default",
117111
"//testing/gmock",
118112
"//testing/gtest",
@@ -130,16 +124,6 @@ rtc_source_set("fileutils") {
130124
sources += [ "testsupport/iosfileutils.mm" ]
131125
}
132126
visibility = [ ":*" ]
133-
deps = [
134-
"..:webrtc_common",
135-
"../base:rtc_base_approved",
136-
]
137-
if (is_ios) {
138-
deps += [ "../sdk:rtc_sdk_common_objc" ]
139-
}
140-
if (is_win) {
141-
deps += [ "../base:rtc_base" ]
142-
}
143127
}
144128

145129
rtc_source_set("video_test_support") {
@@ -158,9 +142,6 @@ rtc_source_set("video_test_support") {
158142
]
159143

160144
deps = [
161-
":test_support",
162-
":video_test_common",
163-
"..:webrtc_common",
164145
"../base:rtc_base_approved",
165146
"../common_video",
166147
"../system_wrappers",
@@ -209,7 +190,6 @@ rtc_source_set("test_support") {
209190
]
210191

211192
deps = [
212-
"..:webrtc_common",
213193
"../base:gtest_prod",
214194
"../base:rtc_base_approved",
215195
"../common_video",
@@ -315,20 +295,12 @@ rtc_test("test_support_unittests") {
315295

316296
deps += [
317297
":direct_transport",
318-
":fake_audio_device",
319298
":fileutils_unittests",
320-
":rtp_test_utils",
321299
":test_common",
322300
":test_main",
323301
":video_test_common",
324302
":video_test_support",
325-
"../api:video_frame_api",
326-
"../base:rtc_base_approved",
327-
"../call:call_interfaces",
328-
"../common_audio",
329-
"../modules/rtp_rtcp",
330303
"../modules/video_capture",
331-
"../system_wrappers",
332304
"//testing/gmock",
333305
"//testing/gtest",
334306
"//third_party/gflags",
@@ -341,7 +313,6 @@ rtc_source_set("fileutils_unittests") {
341313
]
342314
deps = [
343315
":fileutils",
344-
":test_support",
345316
"//testing/gmock",
346317
"//testing/gtest",
347318
]
@@ -360,12 +331,9 @@ rtc_source_set("direct_transport") {
360331
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
361332
}
362333
deps = [
363-
"..:webrtc_common",
364334
"../api:transport_api",
365335
"../base:rtc_base_approved",
366336
"../call",
367-
"../modules/rtp_rtcp",
368-
"../system_wrappers",
369337
]
370338
}
371339

@@ -380,11 +348,8 @@ rtc_source_set("fake_audio_device") {
380348
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
381349
}
382350
deps = [
383-
"..:webrtc_common",
384351
"../base:rtc_base_approved",
385-
"../common_audio",
386-
"../modules/audio_device",
387-
"../system_wrappers",
352+
"../modules/audio_device:audio_device",
388353
]
389354
}
390355

@@ -437,25 +402,13 @@ rtc_source_set("test_common") {
437402
":test_support",
438403
":video_test_common",
439404
"..:webrtc_common",
440-
"../api:transport_api",
441-
"../api:video_frame_api",
442-
"../api/audio_codecs:builtin_audio_decoder_factory",
443405
"../api/video_codecs:video_codecs_api",
444406
"../audio",
445407
"../base:rtc_base_approved",
446-
"../base:rtc_task_queue",
447408
"../call",
448-
"../logging:rtc_event_log_api",
449-
"../modules/audio_device:mock_audio_device",
450409
"../modules/audio_mixer:audio_mixer_impl",
451410
"../modules/audio_processing",
452-
"../modules/rtp_rtcp:rtp_rtcp",
453-
"../modules/video_coding:webrtc_h264",
454-
"../modules/video_coding:webrtc_vp8",
455-
"../modules/video_coding:webrtc_vp9",
456-
"../system_wrappers",
457411
"../video",
458-
"../voice_engine",
459412
"//testing/gmock",
460413
"//testing/gtest",
461414
]
@@ -531,9 +484,6 @@ rtc_source_set("test_renderer") {
531484

532485
deps = [
533486
":test_support",
534-
"..:webrtc_common",
535-
"../base:rtc_base_approved",
536-
"../common_video",
537487
"../modules/media_file",
538488
"//testing/gtest",
539489
]
@@ -545,10 +495,4 @@ rtc_source_set("audio_codec_mocks") {
545495
"mock_audio_decoder.h",
546496
"mock_audio_decoder_factory.h",
547497
]
548-
deps = [
549-
":test_support",
550-
"../api/audio_codecs:audio_codecs_api",
551-
"../api/audio_codecs:builtin_audio_decoder_factory",
552-
"../base:rtc_base_approved",
553-
]
554498
}

‎webrtc/test/fuzzers/BUILD.gn

+10-35
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ rtc_static_library("webrtc_fuzzer_main") {
1515
"webrtc_fuzzer_main.cc",
1616
]
1717
deps = [
18-
"../../base:rtc_base_approved",
1918
"../../system_wrappers:field_trial_default",
2019
"../../system_wrappers:metrics_default",
2120
"//testing/libfuzzer:libfuzzer_main",
@@ -65,7 +64,6 @@ webrtc_fuzzer_test("vp8_qp_parser_fuzzer") {
6564
"vp8_qp_parser_fuzzer.cc",
6665
]
6766
deps = [
68-
"../../modules/video_coding:video_coding_utility",
6967
"../../modules/video_coding/",
7068
]
7169
}
@@ -75,7 +73,6 @@ webrtc_fuzzer_test("h264_bitstream_parser_fuzzer") {
7573
"h264_bitstream_parser_fuzzer.cc",
7674
]
7775
deps = [
78-
"../../common_video",
7976
"../../modules/video_coding/",
8077
]
8178
}
@@ -85,8 +82,7 @@ webrtc_fuzzer_test("flexfec_header_reader_fuzzer") {
8582
"flexfec_header_reader_fuzzer.cc",
8683
]
8784
deps = [
88-
"../../base:rtc_base_approved",
89-
"../../modules/rtp_rtcp",
85+
"../../modules/rtp_rtcp/",
9086
]
9187
}
9288

@@ -95,8 +91,7 @@ webrtc_fuzzer_test("flexfec_sender_fuzzer") {
9591
"flexfec_sender_fuzzer.cc",
9692
]
9793
deps = [
98-
"../../modules/rtp_rtcp",
99-
"../../system_wrappers",
94+
"../../modules/rtp_rtcp/",
10095
]
10196
libfuzzer_options = [ "max_len=200" ]
10297
}
@@ -106,8 +101,7 @@ webrtc_fuzzer_test("ulpfec_header_reader_fuzzer") {
106101
"ulpfec_header_reader_fuzzer.cc",
107102
]
108103
deps = [
109-
"../../base:rtc_base_approved",
110-
"../../modules/rtp_rtcp",
104+
"../../modules/rtp_rtcp/",
111105
]
112106
}
113107

@@ -116,9 +110,7 @@ webrtc_fuzzer_test("ulpfec_generator_fuzzer") {
116110
"ulpfec_generator_fuzzer.cc",
117111
]
118112
deps = [
119-
"../../base:rtc_base_approved",
120-
"../../modules/rtp_rtcp",
121-
"../../modules/rtp_rtcp:rtp_rtcp_unittests",
113+
"../../modules/rtp_rtcp/",
122114
]
123115
}
124116

@@ -127,8 +119,7 @@ webrtc_fuzzer_test("flexfec_receiver_fuzzer") {
127119
"flexfec_receiver_fuzzer.cc",
128120
]
129121
deps = [
130-
"../../base:rtc_base_approved",
131-
"../../modules/rtp_rtcp",
122+
"../../modules/rtp_rtcp/",
132123
]
133124
libfuzzer_options = [ "max_len=2000" ]
134125
}
@@ -138,8 +129,7 @@ webrtc_fuzzer_test("packet_buffer_fuzzer") {
138129
"packet_buffer_fuzzer.cc",
139130
]
140131
deps = [
141-
"../../modules/video_coding",
142-
"../../system_wrappers",
132+
"../../modules/video_coding/",
143133
]
144134
libfuzzer_options = [ "max_len=2000" ]
145135
}
@@ -149,9 +139,7 @@ webrtc_fuzzer_test("rtcp_receiver_fuzzer") {
149139
"rtcp_receiver_fuzzer.cc",
150140
]
151141
deps = [
152-
"../../base:rtc_base_approved",
153-
"../../modules/rtp_rtcp",
154-
"../../system_wrappers",
142+
"../../modules/rtp_rtcp/",
155143
]
156144
seed_corpus = "corpora/rtcp-corpus"
157145
}
@@ -161,7 +149,7 @@ webrtc_fuzzer_test("rtp_packet_fuzzer") {
161149
"rtp_packet_fuzzer.cc",
162150
]
163151
deps = [
164-
"../../modules/rtp_rtcp",
152+
"../../modules/rtp_rtcp/",
165153
]
166154
seed_corpus = "corpora/rtp-corpus"
167155
}
@@ -171,7 +159,7 @@ webrtc_fuzzer_test("rtp_header_fuzzer") {
171159
"rtp_header_fuzzer.cc",
172160
]
173161
deps = [
174-
"../../modules/rtp_rtcp",
162+
"../../modules/rtp_rtcp/",
175163
]
176164
}
177165

@@ -180,11 +168,8 @@ webrtc_fuzzer_test("congestion_controller_feedback_fuzzer") {
180168
"congestion_controller_feedback_fuzzer.cc",
181169
]
182170
deps = [
183-
"../../logging:rtc_event_log_api",
184171
"../../logging:rtc_event_log_impl",
185-
"../../modules/congestion_controller",
186-
"../../modules/remote_bitrate_estimator",
187-
"../../modules/rtp_rtcp",
172+
"../../modules/congestion_controller/",
188173
]
189174
}
190175

@@ -193,12 +178,6 @@ rtc_static_library("audio_decoder_fuzzer") {
193178
"audio_decoder_fuzzer.cc",
194179
"audio_decoder_fuzzer.h",
195180
]
196-
deps = [
197-
"../..:webrtc_common",
198-
"../../api/audio_codecs:audio_codecs_api",
199-
"../../base:rtc_base_approved",
200-
"../../modules/rtp_rtcp",
201-
]
202181
}
203182

204183
webrtc_fuzzer_test("audio_decoder_ilbc_fuzzer") {
@@ -275,10 +254,8 @@ webrtc_fuzzer_test("neteq_rtp_fuzzer") {
275254
"neteq_rtp_fuzzer.cc",
276255
]
277256
deps = [
278-
"../../base:rtc_base_approved",
279257
"../../modules/audio_coding:neteq",
280258
"../../modules/audio_coding:neteq_test_minimal",
281-
"../../modules/audio_coding:neteq_unittest_tools",
282259
"../../modules/audio_coding:pcm16b",
283260
"../../modules/rtp_rtcp",
284261
]
@@ -321,7 +298,6 @@ webrtc_fuzzer_test("pseudotcp_parser_fuzzer") {
321298
"pseudotcp_parser_fuzzer.cc",
322299
]
323300
deps = [
324-
"../../base:rtc_base",
325301
"../../p2p:rtc_p2p",
326302
]
327303
}
@@ -331,7 +307,6 @@ webrtc_fuzzer_test("transport_feedback_packet_loss_tracker_fuzzer") {
331307
"transport_feedback_packet_loss_tracker_fuzzer.cc",
332308
]
333309
deps = [
334-
"../../base:rtc_base_approved",
335310
"../../modules/rtp_rtcp",
336311
"../../voice_engine",
337312
]

0 commit comments

Comments
 (0)