diff options
| author | kjellander <kjellander@webrtc.org> | 2016-01-07 23:26:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 07:26:11 +0000 |
| commit | a2b1e03c66c75f4376d0c19791473a5e25771709 (patch) | |
| tree | a18c664c2e43ba5dd232e3c8ffab98eb8cbb3d17 | |
| parent | 893505d0fb41a840be5e4a44a1250dba83d79bf5 (diff) | |
| download | webrtc-a2b1e03c66c75f4376d0c19791473a5e25771709.tar.gz | |
Disable AudioDeviceAPITest.MicrophoneVolumeTests on Linux.
NOTRY=True
BUG=webrtc:5414
TBR=pbos@webrtc.org
Review URL: https://codereview.webrtc.org/1572503002
Cr-Commit-Position: refs/heads/master@{#11178}
| -rw-r--r-- | webrtc/modules/audio_device/test/audio_device_test_api.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc index f36a049ffc..2e015cd9b3 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc @@ -1040,9 +1040,15 @@ TEST_F(AudioDeviceAPITest, MicrophoneVolumeIsAvailable) { // MicrophoneVolume // MaxMicrophoneVolume // MinMicrophoneVolume -// NOTE: Disabled on mac due to issue 257. -#ifndef WEBRTC_MAC -TEST_F(AudioDeviceAPITest, MicrophoneVolumeTests) { + +// Disabled on Mac and Linux, +// see https://bugs.chromium.org/p/webrtc/issues/detail?id=5414 +#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) +#define MAYBE_MicrophoneVolumeTests DISABLED_MicrophoneVolumeTests +#else +#define MAYBE_MicrophoneVolumeTests MicrophoneVolumeTests +#endif +TEST_F(AudioDeviceAPITest, MAYBE_MicrophoneVolumeTests) { uint32_t vol(0); uint32_t volume(0); uint32_t maxVolume(0); @@ -1135,7 +1141,6 @@ TEST_F(AudioDeviceAPITest, MicrophoneVolumeTests) { EXPECT_EQ(0, audio_device_->SetMicrophoneVolume(maxVolume/10)); } } -#endif // !WEBRTC_MAC TEST_F(AudioDeviceAPITest, SpeakerMuteIsAvailable) { bool available; |