Skip to content

Commit

Permalink
REGRESSION(261288@main): [Win] TestWebCore.WebCoreBundleTest.BundlePa…
Browse files Browse the repository at this point in the history
…thFromNameTypeDirectory is failing

https://bugs.webkit.org/show_bug.cgi?id=259942

Reviewed by Don Olmstead.

Windows port no longer uses Localizable.strings and
mediaControlsLocalizedStrings.js. Removed the test.

* Source/WebCore/PlatformWin.cmake:
* Tools/TestWebKitAPI/Tests/WebCore/win/WebCoreBundle.cpp:
(TEST_F):

Canonical link: https://commits.webkit.org/266793@main
  • Loading branch information
fujii committed Aug 10, 2023
1 parent 6f0a9e8 commit 2e4cd29
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
6 changes: 0 additions & 6 deletions Source/WebCore/PlatformWin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,3 @@ list(APPEND WebCoreTestSupport_LIBRARIES
Cairo::Cairo
shlwapi
)

file(COPY
"${WEBCORE_DIR}/en.lproj/Localizable.strings"
DESTINATION
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
)
10 changes: 0 additions & 10 deletions Tools/TestWebKitAPI/Tests/WebCore/win/WebCoreBundle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,6 @@ TEST_F(WebCoreBundleTest, BundlePathFromNameTypeDirectory)
auto expected = FileSystem::pathByAppendingComponents(m_root, { "WebInspectorUI"_s, "Protocol"_s, "InspectorBackendCommands.js"_s });
EXPECT_STREQ(expected.utf8().data(), actual.utf8().data());

actual = WebCore::webKitBundlePath("Localizable"_s, "strings"_s, ""_s);
expected = FileSystem::pathByAppendingComponents(m_root, { "en.lproj"_s, "Localizable.strings"_s });
EXPECT_STREQ(expected.utf8().data(), actual.utf8().data());

#if !ENABLE(MODERN_MEDIA_CONTROLS)
actual = WebCore::webKitBundlePath("mediaControlsLocalizedStrings"_s, "js"_s, ""_s);
expected = FileSystem::pathByAppendingComponents(m_root, { "en.lproj"_s, "mediaControlsLocalizedStrings.js"_s });
EXPECT_STREQ(expected.utf8().data(), actual.utf8().data());
#endif

actual = WebCore::webKitBundlePath("file-does-not"_s, "exist"_s, "file"_s);
expected = emptyString();
EXPECT_STREQ(expected.utf8().data(), actual.utf8().data());
Expand Down

0 comments on commit 2e4cd29

Please sign in to comment.