Bug 208849 – [PlayStation] Enable TestWTF and TestWebCore

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Yoshiaki Jitsukawa]

Make TestWTF and TestWebCore runnable.

[Yoshiaki Jitsukawa]

Created attachment 393126 [details]
Patch

[Stephan Szabo]

Comment on attachment 393126 [details]
Patch

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

> Source/cmake/OptionsPlayStation.cmake:7
> +set(PLAYSTATION_PLATFORM "playstation" CACHE STRING "PlayStation Platform")

It doesn't look like any of the bits using this value were brought over, so I don't think we need this now (yet).

[Stephan Szabo]

Comment on attachment 393126 [details]
Patch

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

> Tools/TestWebKitAPI/PlatformPlayStation.cmake:32
> +    libcairo

How are the dependencies from libSceNKWebKitRequirements to these managed? Is libcairo included in it or merely that libSceNKWebKitRequirements is linked to the shared library?

[Yoshiaki Jitsukawa]

(In reply to Stephan Szabo from comment #2)
> Comment on attachment 393126 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=393126&action=review
> 
> > Source/cmake/OptionsPlayStation.cmake:7
> > +set(PLAYSTATION_PLATFORM "playstation" CACHE STRING "PlayStation Platform")
> 
> It doesn't look like any of the bits using this value were brought over, so
> I don't think we need this now (yet).

OK, I'll remove it.

[Yoshiaki Jitsukawa]

(In reply to Stephan Szabo from comment #3)
> Comment on attachment 393126 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=393126&action=review
> 
> > Tools/TestWebKitAPI/PlatformPlayStation.cmake:32
> > +    libcairo
> 
> How are the dependencies from libSceNKWebKitRequirements to these managed?
> Is libcairo included in it or merely that libSceNKWebKitRequirements is
> linked to the shared library?

When libcairo is included in libSceNKWebKitRequirements as a static library, then this line is simply ignored because this is no more than a hint to let WEBKIT_EXECUTABLE() to try to copy libcairo.sprx.

[Yoshiaki Jitsukawa]

Created attachment 393205 [details]
Patch

[Yoshiaki Jitsukawa]

Created attachment 396260 [details]
Patch

[Don Olmstead]

Comment on attachment 396260 [details]
Patch

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

Overall looks good. Just have the one nit and its good to go.

> Tools/TestWebKitAPI/playstation/main.cpp:42
> +    dlopen("libicu", RTLD_NOW);
> +    dlopen("libpng16", RTLD_NOW);
> +    dlopen("libfontconfig", RTLD_NOW);
> +    dlopen("libfreetype", RTLD_NOW);
> +    dlopen("libharfbuzz", RTLD_NOW);
> +    dlopen("libcairo", RTLD_NOW);
> +    dlopen("libSceNKWebKitRequirements", RTLD_NOW);
> +    dlopen("libJavaScriptCore", RTLD_NOW);
> +    dlopen("libWebKit", RTLD_NOW);
> +    return TestWebKitAPI::TestsController::singleton().run(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE;

You should guard what shared objects it tries to load based on the test being run. Each executable should define BUILDING_${name} which you can use to only load the applicable libraries.

[Yoshiaki Jitsukawa]

Created attachment 397641 [details]
Patch

[Yoshiaki Jitsukawa]

(In reply to Don Olmstead from comment #8)
> You should guard what shared objects it tries to load based on the test
> being run. Each executable should define BUILDING_${name} which you can use
> to only load the applicable libraries.

BUILDING_TestWebKit/TestWebCore guards added. Thank you.

[EWS]

Committed r260738: <https://trac.webkit.org/changeset/260738>

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

[Radar WebKit Bug Importer]

<rdar://problem/62426001>