summaryrefslogtreecommitdiffstats
path: root/chrome/test/page_cycler
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 18:23:11 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 18:23:11 +0000
commit91f0084f7fdead9cbeda53ecfad2376d36e3740f (patch)
tree590cc6a667eadaeed4519cb36d497e9600ac71b0 /chrome/test/page_cycler
parent33326255c34bcd122da8150b44a7e5b8f006f3ce (diff)
downloadchromium_src-91f0084f7fdead9cbeda53ecfad2376d36e3740f.zip
chromium_src-91f0084f7fdead9cbeda53ecfad2376d36e3740f.tar.gz
chromium_src-91f0084f7fdead9cbeda53ecfad2376d36e3740f.tar.bz2
Get the first set of page_cycler_tests working on Mac. This means: MozFile,
DomFile and DhtmlFile corpus sets. Not enabling Intl1File, Intl2File yet coz they crash Chromium. Not enabling PageCyclerReferenceTest yet coz we don't yet have a reference build. Review URL: http://codereview.chromium.org/67127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler')
-rw-r--r--chrome/test/page_cycler/page_cycler_test.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 91708cf..5d20457 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -250,13 +250,15 @@ class PageCyclerReferenceTest : public PageCyclerTest {
}
};
-} // namespace
// file-URL tests
TEST_F(PageCyclerTest, MozFile) {
RunTest("moz", false);
}
+// TODO(port): Enable PageCyclerReferenceTest when reference build is
+// available for non-windows
+#if !defined(OS_MACOSX)
TEST_F(PageCyclerReferenceTest, MozFile) {
RunTest("moz", false);
}
@@ -265,6 +267,7 @@ TEST_F(PageCyclerTest, Intl1File) {
RunTest("intl1", false);
}
+// TODO(nirnimesh): Intl1File, Intl2File crash Chromium on Mac. Revisit later.
TEST_F(PageCyclerReferenceTest, Intl1File) {
RunTest("intl1", false);
}
@@ -276,19 +279,23 @@ TEST_F(PageCyclerTest, Intl2File) {
TEST_F(PageCyclerReferenceTest, Intl2File) {
RunTest("intl2", false);
}
+#endif // !defined(OS_MACOSX)
TEST_F(PageCyclerTest, DomFile) {
RunTest("dom", false);
}
+#if !defined(OS_MACOSX)
TEST_F(PageCyclerReferenceTest, DomFile) {
RunTest("dom", false);
}
+#endif
TEST_F(PageCyclerTest, DhtmlFile) {
RunTest("dhtml", false);
}
+#if !defined(OS_MACOSX)
TEST_F(PageCyclerReferenceTest, DhtmlFile) {
RunTest("dhtml", false);
}
@@ -333,3 +340,6 @@ TEST_F(PageCyclerTest, BloatHttp) {
TEST_F(PageCyclerReferenceTest, BloatHttp) {
RunTest("bloat", true);
}
+#endif // !defined(OS_MACOSX)
+
+} // namespace