From 33bf69ae6670e339f8bff8a723ef091f997c14a8 Mon Sep 17 00:00:00 2001 From: maxmorin Date: Thu, 23 Mar 2017 04:06:53 -0700 Subject: [PATCH] Skip audio_device_unittest when platform audio isn't used. BUG=7393 Review-Url: https://codereview.webrtc.org/2764403003 Cr-Commit-Position: refs/heads/master@{#17359} --- webrtc/modules/audio_device/audio_device_unittest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_device/audio_device_unittest.cc b/webrtc/modules/audio_device/audio_device_unittest.cc index 19e46ad6dd..6e1d3dc973 100644 --- a/webrtc/modules/audio_device/audio_device_unittest.cc +++ b/webrtc/modules/audio_device/audio_device_unittest.cc @@ -206,8 +206,10 @@ class AudioDeviceTest : public ::testing::Test { AudioDeviceModule::Create(0, AudioDeviceModule::kPlatformDefaultAudio); EXPECT_NE(audio_device_.get(), nullptr); AudioDeviceModule::AudioLayer audio_layer; - EXPECT_EQ(0, audio_device_->ActiveAudioLayer(&audio_layer)); - if (audio_layer == AudioDeviceModule::kLinuxAlsaAudio) { + int got_platform_audio_layer = + audio_device_->ActiveAudioLayer(&audio_layer); + if (got_platform_audio_layer != 0 || + audio_layer == AudioDeviceModule::kLinuxAlsaAudio) { requirements_satisfied_ = false; } if (requirements_satisfied_) {