From ca87b62edec768315d8a99e2b9acfd713db5c58d Mon Sep 17 00:00:00 2001 From: kthelgason Date: Fri, 9 Dec 2016 06:15:19 -0800 Subject: [PATCH] Disable failing perf test on Android. A decision was recently made to limit downscaling to 320x180 on Android. This causes the perf tests to fail. This test is no longer valid on android, as the failure is expected behaviour. BUG=None NOTRY=true TBR=phoglund@webrtc.org Review-Url: https://codereview.webrtc.org/2563913003 Cr-Commit-Position: refs/heads/master@{#15510} --- webrtc/call/call_perf_tests.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc index 36fc64fb96..e03c26dae1 100644 --- a/webrtc/call/call_perf_tests.cc +++ b/webrtc/call/call_perf_tests.cc @@ -471,7 +471,12 @@ TEST_F(CallPerfTest, CaptureNtpTimeWithNetworkJitter) { const int kRunTimeMs = 20000; TestCaptureNtpTime(net_config, kThresholdMs, kStartTimeMs, kRunTimeMs); } - +#if defined(WEBRTC_ANDROID) +// This test is disabled on android as it does not update +// sinkWants below 320x180, the starting resolution for these +// tests. +#define ReceivesCpuOveruseAndUnderuse DISABLED_ReceivesCpuOveruseAndUnderuse +#endif TEST_F(CallPerfTest, ReceivesCpuOveruseAndUnderuse) { class LoadObserver : public test::SendTest, public test::FrameGeneratorCapturer::SinkWantsObserver {