[PlayStation] Update test runner for changes to Options and signing
authorstephan.szabo@sony.com <stephan.szabo@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 27 Jun 2020 14:18:34 +0000 (14:18 +0000)
committerstephan.szabo@sony.com <stephan.szabo@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 27 Jun 2020 14:18:34 +0000 (14:18 +0000)
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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263616 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/shell/playstation/Initializer.cpp
Source/JavaScriptCore/shell/playstation/TestShell.cpp
Tools/ChangeLog
Tools/Scripts/webkitdirs.pm

index 092e009..e245c8d 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-27  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation] Update test runner for changes to Options and signing
+        https://bugs.webkit.org/show_bug.cgi?id=213650
+
+        Reviewed by Don Olmstead.
+
+        * shell/playstation/Initializer.cpp: Load ICU library
+        * shell/playstation/TestShell.cpp: Update between test options reset
+
 2020-06-26  Geoffrey Garen  <ggaren@apple.com>
 
         Initializing the main thread should initialize the main run loop
index 658e1a9..e02f2c7 100644 (file)
@@ -44,4 +44,5 @@ static void initializer(void)
     loadLibraryOrExit("Perf");
     loadLibraryOrExit("PosixWebKit");
     loadLibraryOrExit("libJavaScriptCore");
+    loadLibraryOrExit("libicu");
 }
index 82c9f80..411e868 100644 (file)
 
 #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
     // have a chance to parse options.
@@ -46,9 +59,10 @@ extern "C" void setupTestRun()
 extern "C" void preTest()
 {
 #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());
 }
 
 extern "C" int runTest(int argc, char* argv[])
index 5dc2234..bc6ee5c 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-27  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation] Update test runner for changes to Options and signing
+        https://bugs.webkit.org/show_bug.cgi?id=213650
+
+        Reviewed by Don Olmstead.
+
+        * Scripts/webkitdirs.pm: Update extension for PlayStation binary
+
 2020-06-26  Jonathan Bedard  <jbedard@apple.com>
 
         [webkitpy] Allow callers to override the reported model (Part 1)
index dc3f253..2557699 100755 (executable)
@@ -502,7 +502,7 @@ sub jscPath($)
     my $jscName = "jsc";
     $jscName .= "_debug"  if configuration() eq "Debug_All";
     if (isPlayStation()) {
-        $jscName .= ".elf";
+        $jscName .= ".self";
     } elsif (isAnyWindows()) {
         $jscName .= ".exe";
     }