From 866df6602c7ceb7196c3d32e1dd2e3844592224b Mon Sep 17 00:00:00 2001 From: kwiberg Date: Thu, 10 Dec 2015 04:20:02 -0800 Subject: [PATCH] Typo fix: Enable a bunch of tests that were accidentally disabled They were meant to be run if we have either iSAC float or fix, but the typo made them run for just float. BUG=webrtc:4198, webrtc:4199 Review URL: https://codereview.webrtc.org/1513483005 Cr-Commit-Position: refs/heads/master@{#10969} --- .../audio_coding/acm2/audio_coding_module_unittest_oldapi.cc | 2 +- webrtc/modules/audio_coding/neteq/neteq_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc index 667527768f..3b1b8f25e5 100644 --- a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc @@ -914,7 +914,7 @@ class AcmReceiverBitExactnessOldApi : public ::testing::Test { } }; -#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISAC)) && \ +#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) && \ defined(WEBRTC_CODEC_ILBC) && defined(WEBRTC_CODEC_G722) #define IF_ALL_CODECS(x) x #else diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index e8ef1ad5ff..073e203311 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -453,7 +453,7 @@ void NetEqDecodingTest::PopulateCng(int frame_index, *payload_len = 1; // Only noise level, no spectral parameters. } -#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISAC)) && \ +#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) && \ defined(WEBRTC_CODEC_ILBC) && defined(WEBRTC_CODEC_G722) #define IF_ALL_CODECS(x) x #else