Bug 247875 – REGRESSION(255715@main) [WinCairo] TestWebCore.WebCoreBundleTest.BundlePathFromNameTypeDirectory is failing

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Fujii Hironori]

REGRESSION(255715@main) [WinCairo] TestWebCore.WebCoreBundleTest.BundlePathFromNameTypeDirectory is failing

>     TestWebCore.WebCoreBundleTest.BundlePathFromNameTypeDirectory
> 
>         C:\home\webkit\gc\Tools\TestWebKitAPI\Tests\WebCore\win\WebCoreBundle.cpp:70
>         Expected equality of these values:
>           expected.utf8().data()
>             Which is: "C:\\home\\webkit\\gc\\WebKitBuild\\Debug\\bin64\\WebKit.resources\\en.lproj\\mediaControlsLocalizedStrings.js"
>           actual.utf8().data()
>             Which is: ""

[Fujii Hironori]

Created attachment 463512 [details]
Patch

[Ross Kirsling]

Comment on attachment 463512 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=463512&action=review

r=me with a comment, given that the GTK failure seems to be an existing flaky test.

> Tools/TestWebKitAPI/Tests/WebCore/win/WebCoreBundle.cpp:70
> +    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());

These lines don't need #if ENABLE(MODERN_MEDIA_CONTROLS)?

[Fujii Hironori]

Comment on attachment 463512 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=463512&action=review

>> Tools/TestWebKitAPI/Tests/WebCore/win/WebCoreBundle.cpp:70
>> +    EXPECT_STREQ(expected.utf8().data(), actual.utf8().data());
> 
> These lines don't need #if ENABLE(MODERN_MEDIA_CONTROLS)?

No, it doesn't. Localizable.strings is used by both conditions.

[EWS]

Committed 256644@main (341038cce116): <https://commits.webkit.org/256644@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 463512 [details].

[Radar WebKit Bug Importer]

<rdar://problem/102311470>