From aa80d42eb3696071da31827ff27b3963eda59ac0 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 26 Oct 2017 22:16:56 +0300 Subject: Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335 Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51 Reviewed-by: Konstantin Tokarev --- Tools/PlatformQt.cmake | 8 ++++---- Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'Tools') diff --git a/Tools/PlatformQt.cmake b/Tools/PlatformQt.cmake index 9c5548aa3..41db83119 100644 --- a/Tools/PlatformQt.cmake +++ b/Tools/PlatformQt.cmake @@ -2,10 +2,6 @@ remove_definitions(-DQT_ASCII_CAST_WARNINGS) add_subdirectory(QtTestBrowser) -if (ENABLE_API_TESTS AND NOT ENABLE_WEBKIT2) - add_subdirectory(TestWebKitAPI) -endif () - if (ENABLE_TEST_SUPPORT) add_subdirectory(DumpRenderTree) add_subdirectory(ImageDiff) @@ -17,3 +13,7 @@ endif () # FIXME: Remove when WK2 Tools patches are merged set(ENABLE_WEBKIT2 0) + +if (ENABLE_API_TESTS AND NOT ENABLE_WEBKIT2) + add_subdirectory(TestWebKitAPI) +endif () diff --git a/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp b/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp index 7a1d9297f..fd8836fd1 100644 --- a/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp +++ b/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp @@ -148,7 +148,8 @@ TEST(WTF, StringOperators) EXPECT_N_WTF_STRING_COPIES(2, atomicString + (literal + string + literal)); EXPECT_N_WTF_STRING_COPIES(2, (atomicString + literal) + (string + literal)); -#if COMPILER(MSVC) +// FIXME: Fix compatibility with ICU >= 58.1 +#if COMPILER(MSVC) && !PLATFORM(QT) EXPECT_N_WTF_STRING_COPIES(1, L"wide string" + string); EXPECT_N_WTF_STRING_COPIES(1, string + L"wide string"); EXPECT_N_WTF_STRING_COPIES(1, L"wide string" + atomicString); -- cgit v1.2.3