From c131bf944e939131a04753bf7c6ec06b56378024 Mon Sep 17 00:00:00 2001 From: kjellander Date: Fri, 9 Jun 2017 12:59:11 -0700 Subject: [PATCH] Enable webrtc_nonparallel_tests on iOS simulator After landing https://chromium-review.googlesource.com/528173 only one test needs to be disabled: VirtualSocketServerTest.delay_v4 BUG=webrtc:7727 NOTRY=True TESTED=gn gen out/x64-Debug --args='target_os="ios" ios_enable_code_signing=false is_component_build=false target_cpu="x64"' ninja -C out/x64-Debug webrtc_nonparallel_tests out/x64-Debug/iossim -d "iPhone 6s" -s 10.3 out/x64-Debug/webrtc_nonparallel_tests.app Review-Url: https://codereview.webrtc.org/2909073002 Cr-Commit-Position: refs/heads/master@{#18519} --- tools_webrtc/ios/tests/common_tests.json | 3 +++ webrtc/base/virtualsocket_unittest.cc | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools_webrtc/ios/tests/common_tests.json b/tools_webrtc/ios/tests/common_tests.json index 910b94b856..25f6ea3160 100644 --- a/tools_webrtc/ios/tests/common_tests.json +++ b/tools_webrtc/ios/tests/common_tests.json @@ -33,6 +33,9 @@ }, { "app": "voice_engine_unittests" + }, + { + "app": "webrtc_nonparallel_tests" } ] } diff --git a/webrtc/base/virtualsocket_unittest.cc b/webrtc/base/virtualsocket_unittest.cc index cab8bb0dc3..5f62fd1ae2 100644 --- a/webrtc/base/virtualsocket_unittest.cc +++ b/webrtc/base/virtualsocket_unittest.cc @@ -912,7 +912,15 @@ TEST_F(VirtualSocketServerTest, bandwidth_v6) { BandwidthTest(kIPv6AnyAddress); } -TEST_F(VirtualSocketServerTest, delay_v4) { +// Disabled on iOS simulator since it's a test that relies on being able to +// process packets fast enough in real time, which isn't the case in the +// simulator. +#if defined(TARGET_IPHONE_SIMULATOR) +#define MAYBE_delay_v4 DISABLED_delay_v4 +#else +#define MAYBE_delay_v4 delay_v4 +#endif +TEST_F(VirtualSocketServerTest, MAYBE_delay_v4) { DelayTest(kIPv4AnyAddress); }