Modified: trunk/Tools/ChangeLog (145411 => 145412)
--- trunk/Tools/ChangeLog 2013-03-11 22:12:19 UTC (rev 145411)
+++ trunk/Tools/ChangeLog 2013-03-11 22:15:06 UTC (rev 145412)
@@ -1,3 +1,15 @@
+2013-03-08 Geoffrey Garen <[email protected]>
+
+ Some StringHasher tests are broken because of missing null termination
+ https://bugs.webkit.org/show_bug.cgi?id=111284
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WTF/StringHasher.cpp:
+ (TestWebKitAPI): Added null termination since C strings are null-terminated.
+ (TestWebKitAPI::TEST): Removed #ifdef's that disabled this testing since
+ the bug caught by it is now fixed.
+
2013-03-11 Sheriff Bot <[email protected]>
Unreviewed, rolling out r145200.
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringHasher.cpp (145411 => 145412)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringHasher.cpp 2013-03-11 22:12:19 UTC (rev 145411)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringHasher.cpp 2013-03-11 22:15:06 UTC (rev 145412)
@@ -37,7 +37,7 @@
static const LChar testALChars[6] = { 0x41, 0x95, 0xFF, 0x50, 0x01, 0 };
static const UChar testAUChars[6] = { 0x41, 0x95, 0xFF, 0x50, 0x01, 0 };
-static const UChar testBUChars[5] = { 0x41, 0x95, 0xFFFF, 0x1080, 0x01 };
+static const UChar testBUChars[6] = { 0x41, 0x95, 0xFFFF, 0x1080, 0x01, 0 };
static const unsigned testAHash1 = 0xEA32B004;
static const unsigned testAHash2 = 0x93F0F71E;
@@ -107,14 +107,7 @@
ASSERT_EQ(testBHash5 & 0xFFFFFF, hasher.hashWithTop8BitsMasked());
}
-#if OS(ANDROID)
-// Failing on Android. http://webkit.org/b/111284
-# define MAYBE_StringHasher_addCharacters DISABLED_StringHasher_addCharacters
-#else
-# define MAYBE_StringHasher_addCharacters StringHasher_addCharacters
-#endif
-
-TEST(WTF, MAYBE_StringHasher_addCharacters)
+TEST(WTF, StringHasher_addCharacters)
{
StringHasher hasher;
@@ -273,14 +266,7 @@
ASSERT_EQ(testBHash5 & 0xFFFFFF, hasher.hashWithTop8BitsMasked());
}
-#if OS(ANDROID)
-// Failing on Android. http://webkit.org/b/111284
-# define MAYBE_StringHasher_addCharactersAssumingAligned DISABLED_StringHasher_addCharactersAssumingAligned
-#else
-# define MAYBE_StringHasher_addCharactersAssumingAligned StringHasher_addCharactersAssumingAligned
-#endif
-
-TEST(WTF, MAYBE_StringHasher_addCharactersAssumingAligned)
+TEST(WTF, StringHasher_addCharactersAssumingAligned)
{
StringHasher hasher;
