diff options
author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 15:42:37 +0000 |
---|---|---|
committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 15:42:37 +0000 |
commit | 4a69ba84feda7a6e302e164ec9c4e0a0db5c50cb (patch) | |
tree | aede2f8c0dc987a634ce8147927a9315ee2ff7a2 | |
parent | 961e89716c14bd6c7e1f3394b9696ee60810a676 (diff) | |
download | chromium_src-4a69ba84feda7a6e302e164ec9c4e0a0db5c50cb.zip chromium_src-4a69ba84feda7a6e302e164ec9c4e0a0db5c50cb.tar.gz chromium_src-4a69ba84feda7a6e302e164ec9c4e0a0db5c50cb.tar.bz2 |
Allow the AudioLowLatencyInputOutput, WinAudioOutputTest and WinAudioInputTest tests to run on bots where audio hardware is available.
The tests will succeed (to avoid breaking the tree) with a warning printed out on bots that don't have the necessary hardware.
TEST=Run media_unittests on the build bots.
Review URL: http://codereview.chromium.org/8949015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114638 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 11 insertions, 17 deletions
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc index 88874b0..683bf2b 100644 --- a/media/audio/audio_low_latency_input_output_unittest.cc +++ b/media/audio/audio_low_latency_input_output_unittest.cc @@ -110,11 +110,11 @@ class AudioLowLatencyInputOutputTest : public testing::Test { // Convenience method which ensures that we are not running on the build // bots and that at least one valid input and output device can be found. bool CanRunAudioTests() { - scoped_ptr<base::Environment> env(base::Environment::Create()); - if (env->HasVar("CHROME_HEADLESS")) - return false; - return (audio_manager()->HasAudioInputDevices() && - audio_manager()->HasAudioOutputDevices()); + bool input = audio_manager()->HasAudioInputDevices(); + bool output = audio_manager()->HasAudioOutputDevices(); + LOG_IF(WARNING, !input) << "No input device detected."; + LOG_IF(WARNING, !output) << "No output device detected."; + return input && output; } private: diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc index 2ec87aa..28b2e13 100644 --- a/media/audio/win/audio_low_latency_input_win_unittest.cc +++ b/media/audio/win/audio_low_latency_input_win_unittest.cc @@ -89,13 +89,11 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { // Convenience method which ensures that we are not running on the build // bots and that at least one valid input device can be found. static bool CanRunAudioTests(AudioManager* audio_man) { - scoped_ptr<base::Environment> env(base::Environment::Create()); - if (env->HasVar("CHROME_HEADLESS")) - return false; - // TODO(henrika): note that we use Wave today to query the number of // existing input devices. - return audio_man->HasAudioInputDevices(); + bool input = audio_man->HasAudioInputDevices(); + LOG_IF(WARNING, !input) << "No input device detected."; + return input; } // Convenience method which creates a default AudioInputStream object but diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc index 8f7b28c..fbb4a5f 100644 --- a/media/audio/win/audio_low_latency_output_win_unittest.cc +++ b/media/audio/win/audio_low_latency_output_win_unittest.cc @@ -143,15 +143,11 @@ class ReadFromFileAudioSource : public AudioOutputStream::AudioSourceCallback { // Convenience method which ensures that we are not running on the build // bots and that at least one valid output device can be found. static bool CanRunAudioTests(AudioManager* audio_man) { - if (NULL == audio_man) - return false; - - scoped_ptr<base::Environment> env(base::Environment::Create()); - if (env->HasVar("CHROME_HEADLESS")) - return false; // TODO(henrika): note that we use Wave today to query the number of // existing output devices. - return audio_man->HasAudioOutputDevices(); + bool output = audio_man->HasAudioOutputDevices(); + LOG_IF(WARNING, !output) << "No output devices detected."; + return output; } // Convenience method which creates a default AudioOutputStream object but |