diff options
author | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 23:19:54 +0000 |
---|---|---|
committer | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 23:19:54 +0000 |
commit | fa583d0db5fa493e567d224564c438cb06adfc2b (patch) | |
tree | 4ce0e6bb6cf4796fb828a40572b155de00f1240a /chrome | |
parent | eaa0885f7f32060ea7313e25dc1104d5a9b6b3ba (diff) | |
download | chromium_src-fa583d0db5fa493e567d224564c438cb06adfc2b.zip chromium_src-fa583d0db5fa493e567d224564c438cb06adfc2b.tar.gz chromium_src-fa583d0db5fa493e567d224564c438cb06adfc2b.tar.bz2 |
Exclude specific browser_tests that don't yet work on Mac.
BUG=16322 (http://crbug.com/16322)
TEST=Covered by browser_tests.
Review URL: http://codereview.chromium.org/189007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/browser_browsertest.cc | 3 | ||||
-rw-r--r-- | chrome/browser/download/save_page_browsertest.cc | 10 | ||||
-rw-r--r-- | chrome/chrome.gyp | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 8d5e721..ee63646 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -96,6 +96,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, Title) { EXPECT_EQ(WideToUTF16(test_title), tab_title); } +#if !defined(OS_MACOSX) +// TODO(port): BUG16322 IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) { GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html")); ui_test_utils::NavigateToURL(browser(), url); @@ -112,6 +114,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) { EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->selected_index()); } +#endif // !defined(OS_MACOSX) // Create 34 tabs and verify that a lot of processes have been created. The // exact number of processes depends on the amount of memory. Previously we diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 4c4df11..6962165 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -15,6 +15,8 @@ #include "chrome/test/ui_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" +#if !defined(OS_MACOSX) +// TODO(port): BUG16322 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("save_page"); static const char* kAppendedExtension = @@ -24,6 +26,8 @@ static const char* kAppendedExtension = ".html"; #endif +#endif // !defined(OS_MACOSX) + namespace { class SavePageFinishedObserver : public NotificationObserver { @@ -70,6 +74,8 @@ class SavePageBrowserTest : public InProcessBrowserTest { ScopedTempDir save_dir_; }; +#if !defined(OS_MACOSX) +// TODO(port): BUG16322 IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveHTMLOnly) { FilePath file_name(FILE_PATH_LITERAL("a.htm")); GURL url = URLRequestMockHTTPJob::GetMockUrl( @@ -127,6 +133,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveCompleteHTML) { test_dir_.Append(FilePath(kTestDir)).AppendASCII("1.css"), dir.AppendASCII("1.css"))); } +#endif // !defined(OS_MACOSX) IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, NoSave) { ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); @@ -134,6 +141,8 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, NoSave) { EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_SAVE_PAGE)); } +#if !defined(OS_MACOSX) +// TODO(port): BUG16322 IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FileNameFromPageTitle) { FilePath file_name(FILE_PATH_LITERAL("b.htm")); @@ -168,5 +177,6 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FileNameFromPageTitle) { test_dir_.Append(FilePath(kTestDir)).AppendASCII("1.css"), dir.AppendASCII("1.css"))); } +#endif // !defined(OS_MACOSX) } // namespace diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 56b4a71..84401b8 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -79,6 +79,7 @@ 'browser/extensions/extension_browsertest.h', 'browser/extensions/extension_browsertests_misc.cc', 'browser/extensions/extension_override_apitest.cc', + 'browser/ssl/ssl_browser_tests.cc', ], # TODO(jcampan): move these vars to views.gyp. 'views_unit_tests_sources': [ |