Title: [240130] trunk/Tools
- Revision
- 240130
- Author
- achristen...@apple.com
- Date
- 2019-01-17 13:38:34 -0800 (Thu, 17 Jan 2019)
Log Message
Fix string concatenation API test after r239920
https://bugs.webkit.org/show_bug.cgi?id=193551
<rdar://problem/47359304>
Reviewed by Youenn Fablet.
* TestWebKitAPI/Tests/WTF/StringConcatenate.cpp:
(TestWebKitAPI::TEST):
Cocoa platforms' interpretation of UChar/unsigned short equality is not affected by ICU's recent change of UChar's type
in WebKit's build configuration like it apparently is on Linux.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (240129 => 240130)
--- trunk/Tools/ChangeLog 2019-01-17 21:36:48 UTC (rev 240129)
+++ trunk/Tools/ChangeLog 2019-01-17 21:38:34 UTC (rev 240130)
@@ -1,3 +1,16 @@
+2019-01-17 Alex Christensen <achristen...@webkit.org>
+
+ Fix string concatenation API test after r239920
+ https://bugs.webkit.org/show_bug.cgi?id=193551
+ <rdar://problem/47359304>
+
+ Reviewed by Youenn Fablet.
+
+ * TestWebKitAPI/Tests/WTF/StringConcatenate.cpp:
+ (TestWebKitAPI::TEST):
+ Cocoa platforms' interpretation of UChar/unsigned short equality is not affected by ICU's recent change of UChar's type
+ in WebKit's build configuration like it apparently is on Linux.
+
2019-01-17 Aakash Jain <aakash_j...@apple.com>
[ews-build] validate-patch should handle the case when bug_id is None
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringConcatenate.cpp (240129 => 240130)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringConcatenate.cpp 2019-01-17 21:36:48 UTC (rev 240129)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringConcatenate.cpp 2019-01-17 21:38:34 UTC (rev 240130)
@@ -82,7 +82,7 @@
EXPECT_EQ("hello 0 world", makeString("hello ", 0u , " world"));
EXPECT_EQ("hello 42 world", makeString("hello ", static_cast<unsigned char>(42) , " world"));
-#if PLATFORM(WIN) || U_ICU_VERSION_MAJOR_NUM >= 59
+#if PLATFORM(WIN) || (U_ICU_VERSION_MAJOR_NUM >= 59 && !PLATFORM(COCOA))
EXPECT_EQ("hello 42 world", makeString("hello ", static_cast<unsigned short>(42) , " world"));
#else
EXPECT_EQ("hello * world", makeString("hello ", static_cast<unsigned short>(42) , " world")); // Treated as a character.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
