diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 21:42:33 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 21:42:33 +0000 |
| commit | 015ed8bbc256a94f03dacf13e93c05e4eff25dcd (patch) | |
| tree | 479976899d3e957a77da598bb05ee145876219be /chrome/app | |
| parent | 71d1ab42f849b22bc26bcf2756d5d664a5454884 (diff) | |
| download | chromium_src-015ed8bbc256a94f03dacf13e93c05e4eff25dcd.zip chromium_src-015ed8bbc256a94f03dacf13e93c05e4eff25dcd.tar.gz chromium_src-015ed8bbc256a94f03dacf13e93c05e4eff25dcd.tar.bz2 | |
ifdef out tests that don't apply to the Mac
The reason these tests were failing on the Mac is that they test something that the Mac explicitly doesn't support: opening a new window in the existing browser process by re-running from the command line. This ifdefs out the tests that don't apply to the Mac, and the helper method that they are built on so that new tests using it won't accidentally be run on the Mac.
BUG=45108
TEST=N/A
Review URL: http://codereview.chromium.org/3394018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main_uitest.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc index 851a592..65df2c2 100644 --- a/chrome/app/chrome_main_uitest.cc +++ b/chrome/app/chrome_main_uitest.cc @@ -39,10 +39,10 @@ TEST_F(ChromeMainTest, AppTestingInterface) { EXPECT_EQ(1, GetTabCount()); } -#if defined(OS_MACOSX) -// Fails an SQL assertion on Mac: http://crbug.com/45108 -#define SecondLaunch DISABLED_SecondLaunch -#endif +#if !defined(OS_MACOSX) +// These tests don't apply to the Mac version; see +// LaunchAnotherBrowserBlockUntilClosed for details. + // Make sure that the second invocation creates a new window. TEST_F(ChromeMainTest, SecondLaunch) { include_testing_id_ = false; @@ -53,11 +53,6 @@ TEST_F(ChromeMainTest, SecondLaunch) { ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2)); } -#if defined(OS_MACOSX) -// Fails an SQL assertion on Mac: http://crbug.com/45108 -#define ReuseBrowserInstanceWhenOpeningFile \ - DISABLED_ReuseBrowserInstanceWhenOpeningFile -#endif TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { include_testing_id_ = false; @@ -69,3 +64,5 @@ TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { ASSERT_TRUE(automation()->IsURLDisplayed(net::FilePathToFileURL(test_file))); } + +#endif // !OS_MACOSX |