From 0be3e040f6c3bb1b725bcb8368569267ed0dd40d Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Fri, 30 Oct 2015 21:21:03 +0100 Subject: [PATCH] Disable PhysicalSocketTest.TestUdpReadyToSendIPv4 on Android. The test didn't previously run on Android bots, but was enabled by mistake in https://codereview.webrtc.org/1426643003/ It used to be long to the rtc_unittests target, which also don't run on Android unfortunately. For now, let's just disable this one test on Android to get the bots go green. BUG=4364 TBR=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1419033007 . Cr-Commit-Position: refs/heads/master@{#10464} --- webrtc/base/physicalsocketserver_unittest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc index 6c7be9f63c..f2eabcd66c 100644 --- a/webrtc/base/physicalsocketserver_unittest.cc +++ b/webrtc/base/physicalsocketserver_unittest.cc @@ -215,8 +215,9 @@ TEST_F(PhysicalSocketTest, MAYBE_TestUdpIPv6) { // https://code.google.com/p/webrtc/issues/detail?id=4958 // TODO(deadbeef): Enable again once test is reimplemented to be unflaky. // Also disable for ASan. +// Disabled on Android: https://code.google.com/p/webrtc/issues/detail?id=4364 #if defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || \ - defined(ADDRESS_SANITIZER) + defined(ADDRESS_SANITIZER) || defined(WEBRTC_ANDROID) #define MAYBE_TestUdpReadyToSendIPv4 DISABLED_TestUdpReadyToSendIPv4 #else #define MAYBE_TestUdpReadyToSendIPv4 TestUdpReadyToSendIPv4