From 5156c94f89cf5faff86cd6355051f2cc819cd9e1 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 4 Jun 2013 05:47:24 +0000 Subject: [PATCH] Disable neteq_unittests on Win x64 in code. Having this failing test being disabled in code will make it possible to add it on the bots again, and make thus no bot configuration update needs to be communicated when it's fixed. BUG=1460 TEST=Compiled with GYP_DEFINES=target_arch=x64 and ran the test successsfully on Windows. Also ran regular trybots. R=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1595004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4165 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_coding/neteq/webrtc_neteq_unittest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/audio_coding/neteq/webrtc_neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/webrtc_neteq_unittest.cc index 7f51c665d..97012612a 100644 --- a/webrtc/modules/audio_coding/neteq/webrtc_neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/webrtc_neteq_unittest.cc @@ -375,7 +375,14 @@ void NetEqDecodingTest::PopulateCng(int frame_index, *payload_len = 1; // Only noise level, no spectral parameters. } -TEST_F(NetEqDecodingTest, TestBitExactness) { +#if defined(_WIN32) && defined(WEBRTC_ARCH_64_BITS) +// Disabled for Windows 64-bit until webrtc:1460 is fixed. +#define MAYBE_TestBitExactness DISABLED_TestBitExactness +#else +#define MAYBE_TestBitExactness TestBitExactness +#endif + +TEST_F(NetEqDecodingTest, MAYBE_TestBitExactness) { const std::string kInputRtpFile = webrtc::test::ProjectRootPath() + "resources/audio_coding/neteq_universal.rtp"; #if defined(_MSC_VER) && (_MSC_VER >= 1700)