Changeset 263616 in webkit for trunk/Source/JavaScriptCore/shell

Timestamp:

Jun 27, 2020, 7:18:34 AM (5 years ago)

Author:

[email protected]

Message:

[PlayStation] Update test runner for changes to Options and signing
​https://bugs.webkit.org/show_bug.cgi?id=213650

Reviewed by Don Olmstead.

Source/JavaScriptCore:

• shell/playstation/Initializer.cpp: Load ICU library
• shell/playstation/TestShell.cpp: Update between test options reset

Tools:

• Scripts/webkitdirs.pm: Update extension for PlayStation binary

Location:

trunk/Source/JavaScriptCore/shell/playstation

Files:

• Initializer.cpp (modified) (1 diff)
• TestShell.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/shell/playstation/Initializer.cpp

@@ -45 +45 @@
     loadLibraryOrExit("PosixWebKit");
     loadLibraryOrExit("libJavaScriptCore");
+    loadLibraryOrExit("libicu");
 }

trunk/Source/JavaScriptCore/shell/playstation/TestShell.cpp

@@ -26 +26 @@
 #include "../jsc.cpp"
 
+#include <wtf/Language.h>
+
+#define STATIC_OPTION(type_, name_, defaultValue_, availability_, description_) \
+    static OptionsStorage::type_ orig##name_;
+    FOR_EACH_JSC_OPTION(STATIC_OPTION)
+#undef STATIC_OPTION
+
 extern "C" void setupTestRun()
 {
+    CommandLine options(0, nullptr);
+#define STATIC_OPTION(type_, name_, defaultValue_, availability_, description_) \
+    orig##name_ = JSC::Options::name_();
+    FOR_EACH_JSC_OPTION(STATIC_OPTION)
+#undef STATIC_OPTION
+
     // Need to initialize WTF threading before we start any threads. Cannot initialize JSC
     // threading yet, since that would do somethings that we'd like to defer until after we
@@ -47 +60 @@
 {
 #define INIT_OPTION(type_, name_, defaultValue_, availability_, description_) \
-    JSC::Options::name_() = JSC::Options::name_##Default();
+    JSC::Options::name_() = orig##name_;
     FOR_EACH_JSC_OPTION(INIT_OPTION)
 #undef INIT_OPTION
+    overrideUserPreferredLanguages(platformUserPreferredLanguages());
 }