Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(920)

Unified Diff: webrtc/modules/audio_device/audio_device_unittest.cc

Issue 2764403003: Skip audio_device_unittest when platform audio isn't used. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_device/audio_device_unittest.cc
diff --git a/webrtc/modules/audio_device/audio_device_unittest.cc b/webrtc/modules/audio_device/audio_device_unittest.cc
index 19e46ad6dd62d0306e7192b25e7f9e178fcd249e..6e1d3dc9730a84298090e033120a27cd3ace4402 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_) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698