diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-26 22:16:56 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-26 19:57:12 +0000 |
| commit | aa80d42eb3696071da31827ff27b3963eda59ac0 (patch) | |
| tree | 9b8460aa5aa4b06eb22ff6a8881d0a1fce9e2c0f /Tools | |
| parent | f5345badaeefac7c03c8a26dea6b89706871c3fe (diff) | |
Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335
Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/PlatformQt.cmake | 8 | ||||
| -rw-r--r-- | Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp | 3 |
2 files changed, 6 insertions, 5 deletions
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); |