diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 20:15:38 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 20:15:38 +0000 |
| commit | 6f0bd88877d08d76d73d64dea2c904597dfdf5a0 (patch) | |
| tree | d7e987112d1ead897691aea1faea487033856391 | |
| parent | 31499a93bba2a832d52bc44c7821a421931cae09 (diff) | |
| download | chromium_src-6f0bd88877d08d76d73d64dea2c904597dfdf5a0.zip chromium_src-6f0bd88877d08d76d73d64dea2c904597dfdf5a0.tar.gz chromium_src-6f0bd88877d08d76d73d64dea2c904597dfdf5a0.tar.bz2 | |
[Mac] skip a test that fails on 10.6 so we can spin up the 10.6 tester bots.
BUG=34785
TEST=tests still run on the 10.5 bots and passes.
Review URL: http://codereview.chromium.org/652131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39760 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/spellchecker_platform_engine_unittest.cc | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/chrome/browser/spellchecker_platform_engine_unittest.cc b/chrome/browser/spellchecker_platform_engine_unittest.cc index d4bf050..cae2af8 100644 --- a/chrome/browser/spellchecker_platform_engine_unittest.cc +++ b/chrome/browser/spellchecker_platform_engine_unittest.cc @@ -7,9 +7,13 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) +#include "base/logging.h" +#include "base/sys_info.h" #define MAYBE_IgnoreWords_EN_US IgnoreWords_EN_US +#define MAYBE_SpellCheckSuggestions_EN_US SpellCheckSuggestions_EN_US #else #define MAYBE_IgnoreWords_EN_US DISABLED_IgnoreWords_EN_US +#define MAYBE_SpellCheckSuggestions_EN_US DISABLED_SpellCheckSuggestions_EN_US #endif // Tests that words are properly ignored. Currently only enabled on OS X as it @@ -17,6 +21,16 @@ // supply a non-zero doc_tag, in order to test that ignored words are matched to // the correct document. TEST(PlatformSpellCheckTest, MAYBE_IgnoreWords_EN_US) { +#if defined(OS_MACOSX) + // http://crbug.com/34785 these fail on 10.6, skipping on 10.6 but leaving + // running on 10.5 for now. + int32 major, minor, bugfix; + base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); + if (major > 10 || (major == 10 && minor > 5)) { + LOG(WARNING) << "Skipping test on 10.6 as it doesn't pass yet."; + return; + } +#endif static const struct { // A misspelled word. const char* input; @@ -63,8 +77,17 @@ TEST(PlatformSpellCheckTest, MAYBE_IgnoreWords_EN_US) { } } // Test IgnoreWords_EN_US +TEST(PlatformSpellCheckTest, MAYBE_SpellCheckSuggestions_EN_US) { #if defined(OS_MACOSX) -TEST(PlatformSpellCheckTest, SpellCheckSuggestions_EN_US) { + // http://crbug.com/34785 these fail on 10.6, skipping on 10.6 but leaving + // running on 10.5 for now. + int32 major, minor, bugfix; + base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); + if (major > 10 || (major == 10 && minor > 5)) { + LOG(WARNING) << "Skipping test on 10.6 as it doesn't pass yet."; + return; + } +#endif static const struct { // A string to be tested. const wchar_t* input; @@ -389,5 +412,3 @@ TEST(PlatformSpellCheckTest, SpellCheckSuggestions_EN_US) { EXPECT_TRUE(suggested_word_is_present); } } - -#endif // defined(OS_MACOSX) |