diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 23:21:50 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 23:21:50 +0000 |
| commit | 2bf13e39154c79f9072623d76f8875d998b5d8f9 (patch) | |
| tree | 158149e6df25e995c5a308aa15bbc5a4d3448f5b /chrome/common/logging_chrome_uitest.cc | |
| parent | e2026714d2735956dcd079100bc4039de33b9bdd (diff) | |
| download | chromium_src-2bf13e39154c79f9072623d76f8875d998b5d8f9.zip chromium_src-2bf13e39154c79f9072623d76f8875d998b5d8f9.tar.gz chromium_src-2bf13e39154c79f9072623d76f8875d998b5d8f9.tar.bz2 | |
Compile all the chrome_test UI tests on the Mac
Removes the last of the ui test exceptions on the Mac, disabling a couple of tests as necessary to keep things green.
BUG=45108,45243
TEST=Tests run
Review URL: http://codereview.chromium.org/2234007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/logging_chrome_uitest.cc')
| -rw-r--r-- | chrome/common/logging_chrome_uitest.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc index f52ab7d..1b64cae 100644 --- a/chrome/common/logging_chrome_uitest.cc +++ b/chrome/common/logging_chrome_uitest.cc @@ -20,8 +20,6 @@ #include "chrome/test/ui/ui_test.h" #include "testing/gtest/include/gtest/gtest.h" -namespace { - class ChromeLoggingTest : public testing::Test { public: // Stores the current value of the log file name environment @@ -54,7 +52,6 @@ class ChromeLoggingTest : public testing::Test { private: std::string environment_filename_; // Saves real environment value. }; -}; // Tests the log file name getter without an environment variable. TEST_F(ChromeLoggingTest, LogFileName) { @@ -106,6 +103,9 @@ class AssertionTest : public UITest { #if defined(OS_WIN) // http://crbug.com/26715 #define Assertion DISABLED_Assertion +#elif defined(OS_MACOSX) +// Crash service doesn't exist for the Mac yet: http://crbug.com/45243 +#define Assertion DISABLED_Assertion #endif TEST_F(AssertionTest, Assertion) { if (UITest::in_process_renderer()) { @@ -137,6 +137,9 @@ class CheckFalseTest : public UITest { #if defined(OS_WIN) // http://crbug.com/38497 #define CheckFails FLAKY_CheckFails +#elif defined(OS_MACOSX) +// Crash service doesn't exist for the Mac yet: http://crbug.com/45243 +#define CheckFails DISABLED_CheckFails #endif // Launch the app in assertion test mode, then close the app. TEST_F(CheckFalseTest, CheckFails) { @@ -175,6 +178,9 @@ class RendererCrashTest : public UITest { #elif defined(OS_CHROMEOS) // http://crbug.com/43115 #define Crash DISABLED_Crash +#elif defined(OS_MACOSX) +// Crash service doesn't exist for the Mac yet: http://crbug.com/45243 +#define Crash DISABLED_Crash #endif // Launch the app in renderer crash test mode, then close the app. TEST_F(RendererCrashTest, Crash) { |