Title: [102362] trunk/Source/WebKit/chromium
- Revision
- 102362
- Author
- pe...@chromium.org
- Date
- 2011-12-08 12:16:29 -0800 (Thu, 08 Dec 2011)
Log Message
[Chromium] Exclude the four RenderTableCellDeathTest death tests for Android
https://bugs.webkit.org/show_bug.cgi?id=73997
The ASSERT_DEATH macro is not yet available in Google Test when
building for Android, which causes compilation errors. This code
will be removed once support lands in the GTest version Chromium
uses. See https://bugs.webkit.org/show_bug.cgi?id=74089.
Reviewed by Julien Chaffraix.
* tests/RenderTableCellTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102361 => 102362)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-08 20:11:57 UTC (rev 102361)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-08 20:16:29 UTC (rev 102362)
@@ -1,3 +1,17 @@
+2011-12-08 Peter Beverloo <pe...@chromium.org>
+
+ [Chromium] Exclude the four RenderTableCellDeathTest death tests for Android
+ https://bugs.webkit.org/show_bug.cgi?id=73997
+
+ The ASSERT_DEATH macro is not yet available in Google Test when
+ building for Android, which causes compilation errors. This code
+ will be removed once support lands in the GTest version Chromium
+ uses. See https://bugs.webkit.org/show_bug.cgi?id=74089.
+
+ Reviewed by Julien Chaffraix.
+
+ * tests/RenderTableCellTest.cpp:
+
2011-12-08 Joshua Bell <jsb...@chromium.org>
IndexedDB: WebKit API addition of IDBObjectStore.count() and IDBIndex.count()
Modified: trunk/Source/WebKit/chromium/tests/RenderTableCellTest.cpp (102361 => 102362)
--- trunk/Source/WebKit/chromium/tests/RenderTableCellTest.cpp 2011-12-08 20:11:57 UTC (rev 102361)
+++ trunk/Source/WebKit/chromium/tests/RenderTableCellTest.cpp 2011-12-08 20:16:29 UTC (rev 102362)
@@ -110,6 +110,10 @@
EXPECT_EQ(maxRowIndex, m_cell->row());
}
+// FIXME: Re-enable these tests once ASSERT_DEATH is supported for Android.
+// See: https://bugs.webkit.org/show_bug.cgi?id=74089
+#if !OS(ANDROID)
+
TEST_F(RenderTableCellDeathTest, CrashIfColumnOverflowOnSetting)
{
ASSERT_DEATH(m_cell->setCol(maxColumnIndex + 1), "");
@@ -130,6 +134,8 @@
ASSERT_DEATH(m_cell->setRow(unsetRowIndex), "");
}
+#endif
+
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
