diff options
| author | eblake@chromium.org <eblake@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 23:25:16 +0000 |
|---|---|---|
| committer | eblake@chromium.org <eblake@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 23:25:16 +0000 |
| commit | c1443d84cafab2dc81650715b102afe4d28cb27b (patch) | |
| tree | 33d86b4ad1a2a7912f936fe1e30b519b4bba966c /chrome/browser | |
| parent | 2914600dedd1b9c37b3844d5f878c063a7d2c106 (diff) | |
| download | chromium_src-c1443d84cafab2dc81650715b102afe4d28cb27b.zip chromium_src-c1443d84cafab2dc81650715b102afe4d28cb27b.tar.gz chromium_src-c1443d84cafab2dc81650715b102afe4d28cb27b.tar.bz2 | |
Mark GrammarAttribute and TestBasicRecognition as DISABLED for Chrome builds
BUG=71227
TEST=./out/Release/browser_tests --lib=browser_tests --gtest_print_time
Review URL: http://codereview.chromium.org/6400008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/speech/speech_input_browsertest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/speech/speech_input_browsertest.cc b/chrome/browser/speech/speech_input_browsertest.cc index 45b41be..0b8c904 100644 --- a/chrome/browser/speech/speech_input_browsertest.cc +++ b/chrome/browser/speech/speech_input_browsertest.cc @@ -175,7 +175,11 @@ SpeechInputManager* SpeechInputBrowserTest::speech_input_manager_ = NULL; // another test here to check that when speech recognition is in progress and // a renderer crashes, we get a call to // SpeechInputManager::CancelAllRequestsWithDelegate. -#if defined(OS_WIN) +// +// Marked as DISABLED due to http://crbug.com/71227 +#if defined(GOOGLE_CHROME_BUILD) +#define MAYBE_TestBasicRecognition DISABLED_TestBasicRecognition +#elif defined(OS_WIN) #define MAYBE_TestBasicRecognition FLAKY_TestBasicRecognition #else #define MAYBE_TestBasicRecognition TestBasicRecognition @@ -186,7 +190,10 @@ IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, MAYBE_TestBasicRecognition) { } // Marked as FLAKY due to http://crbug.com/51337 -#if defined(OS_WIN) +// Marked as DISALBED due to http://crbug.com/71227 +#if defined(GOOGLE_CHROME_BUILD) +#define MAYBE_GrammarAttribute DISABLED_GrammarAttribute +#elif defined(OS_WIN) #define MAYBE_GrammarAttribute FLAKY_GrammarAttribute #else #define MAYBE_GrammarAttribute GrammarAttribute |