build: change more tests to use rtc_test instead of rtc_exectuable which requires clobbering on the ios bots. Also remove _temp suffix from base64 benchmark. Bug: webrtc:467294026 Change-Id: I4d1fe493c41438ab2f83bc1c3acbecc024b15128 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/443384 Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com> Reviewed-by: Jeremy Leconte <jleconte@google.com> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47106}
diff --git a/BUILD.gn b/BUILD.gn index cd4379f..4d154f8 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -694,7 +694,7 @@ rtc_executable("benchmarks") { testonly = true deps = [ - "rtc_base:base64_benchmark_temp", + "rtc_base:base64_benchmark", "rtc_base/synchronization:mutex_benchmark", "test:benchmark_main", ]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 132b293..d8e1e97 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn
@@ -1280,7 +1280,7 @@ ] } - rtc_executable("neteq_opus_quality_test") { + rtc_test("neteq_opus_quality_test") { testonly = true sources = [ "neteq/test/neteq_opus_quality_test.cc" ] @@ -1295,7 +1295,6 @@ "../../api/audio_codecs:audio_codecs_api", "../../rtc_base:buffer", "../../rtc_base:checks", - "../../test:test_main", "../../test:test_support", "//testing/gtest", "//third_party/abseil-cpp/absl/flags:flag", @@ -1318,7 +1317,7 @@ ] } - rtc_executable("neteq_pcmu_quality_test") { + rtc_test("neteq_pcmu_quality_test") { testonly = true sources = [ "neteq/test/neteq_pcmu_quality_test.cc" ] @@ -1333,14 +1332,13 @@ "../../rtc_base:checks", "../../rtc_base:safe_conversions", "../../test:fileutils", - "../../test:test_main", "../../test:test_support", "//testing/gtest", "//third_party/abseil-cpp/absl/flags:flag", ] } - rtc_executable("neteq_pcm16b_quality_test") { + rtc_test("neteq_pcm16b_quality_test") { testonly = true sources = [ "neteq/test/neteq_pcm16b_quality_test.cc" ] @@ -1355,7 +1353,6 @@ "../../rtc_base:checks", "../../rtc_base:safe_conversions", "../../test:fileutils", - "../../test:test_main", "../../test:test_support", "//testing/gtest", "//third_party/abseil-cpp/absl/flags:flag", @@ -1380,7 +1377,7 @@ } if (!build_with_chromium) { - rtc_executable("webrtc_opus_fec_test") { + rtc_test("webrtc_opus_fec_test") { testonly = true sources = [ "codecs/opus/opus_fec_test.cc" ] @@ -1389,7 +1386,6 @@ ":webrtc_opus", "../../common_audio", "../../test:fileutils", - "../../test:test_main", "../../test:test_support", "//testing/gtest", ]
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 5eda096..3915a10 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn
@@ -490,7 +490,7 @@ if (rtc_include_tests) { if (!build_with_chromium) { - rtc_executable("test_packet_masks_metrics") { + rtc_test("test_packet_masks_metrics") { testonly = true sources = [ @@ -503,7 +503,6 @@ "..:module_fec_api", "../../rtc_base:checks", "../../test:fileutils", - "../../test:test_main", "../../test:test_support", "//testing/gtest", ]
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 0b11310..0c97fa0 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn
@@ -1235,7 +1235,7 @@ "//third_party/abseil-cpp/absl/strings:string_view", ] } - rtc_executable("dtls_ice_integration_bench") { + rtc_test("dtls_ice_integration_bench") { testonly = true sources = [ @@ -1283,7 +1283,6 @@ "../rtc_base:ssl_adapter", "../rtc_base:threading", "../test:create_test_field_trials", - "../test:test_main", "../test:test_support", "../test:wait_until", "//third_party/abseil-cpp/absl/algorithm:container",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index b589a35..89498c5 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn
@@ -1994,7 +1994,7 @@ if (rtc_include_tests) { if (rtc_enable_google_benchmarks) { - rtc_library("base64_benchmark_temp") { + rtc_library("base64_benchmark") { testonly = true sources = [ "base64_benchmark.cc" ] deps = [
diff --git a/tools_webrtc/get_landmines.py b/tools_webrtc/get_landmines.py index aa4edbe..65c29db 100755 --- a/tools_webrtc/get_landmines.py +++ b/tools_webrtc/get_landmines.py
@@ -53,7 +53,7 @@ print('Clobber because of libc++ issue - take 5 (crbug.com/1337238)') print('Clobber because of libc++ issue - take 6 (crbug.com/1337238)') print('Clobber because b/367066321') - if host_os() == 'mac': + if host_os() == 'mac': # includes iOS print('Clobber due to iOS compile errors (crbug.com/694721)') print('Clobber to unblock https://codereview.webrtc.org/2709573003') print('Clobber to fix https://codereview.webrtc.org/2709573003 after ' @@ -69,6 +69,8 @@ print('Switching rtc_executable to rtc_test') print('Lets clobber iOS due to signing issue b/396118151') print('Lets clobber iOS due to signing issue b/396118151 (2nd try)') + print('Lets clobber iOS due to rtc_executable -> rtc_test') + print('Lets clobber iOS due to rtc_executable -> rtc_test') if host_os() == 'android': print('Clobber due to Android "compile confirm no-op" errors.')