From 8bd6f19abe8e1d5d74166b2160bde1cd4c17cddb Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 15 Feb 2012 01:47:51 +0000 Subject: [PATCH] Disable flaky CpuTest.Usage on Windows. TBR=turaj@webrtc.org BUG=290 TEST=system_wrapper_unittests Review URL: https://webrtc-codereview.appspot.com/396005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1689 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/system_wrappers/source/cpu_wrapper_unittest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/system_wrappers/source/cpu_wrapper_unittest.cc b/src/system_wrappers/source/cpu_wrapper_unittest.cc index 25e97cd750..cd149dc30f 100644 --- a/src/system_wrappers/source/cpu_wrapper_unittest.cc +++ b/src/system_wrappers/source/cpu_wrapper_unittest.cc @@ -23,7 +23,14 @@ using webrtc::EventWrapper; using webrtc::scoped_ptr; using webrtc::Trace; -TEST(CpuWrapperTest, Usage) { +// This test is flaky on Windows/Release. +// http://code.google.com/p/webrtc/issues/detail?id=290 +#ifdef _WIN32 +#define MAYBE_Usage DISABLED_Usage +#else +#define MAYBE_Usage Usage +#endif +TEST(CpuWrapperTest, MAYBE_Usage) { Trace::CreateTrace(); std::string trace_file = webrtc::test::OutputPath() + "cpu_wrapper_unittest.txt";