Title: [263616] trunk
Revision
263616
Author
stephan.sz...@sony.com
Date
2020-06-27 07:18:34 -0700 (Sat, 27 Jun 2020)

Log 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/_javascript_Core:

* 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

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (263615 => 263616)


--- trunk/Source/_javascript_Core/ChangeLog	2020-06-27 06:17:10 UTC (rev 263615)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-06-27 14:18:34 UTC (rev 263616)
@@ -1,3 +1,13 @@
+2020-06-27  Stephan Szabo  <stephan.sz...@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  <gga...@apple.com>
 
         Initializing the main thread should initialize the main run loop

Modified: trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp (263615 => 263616)


--- trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp	2020-06-27 06:17:10 UTC (rev 263615)
+++ trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp	2020-06-27 14:18:34 UTC (rev 263616)
@@ -44,4 +44,5 @@
     loadLibraryOrExit("Perf");
     loadLibraryOrExit("PosixWebKit");
     loadLibraryOrExit("libJavaScriptCore");
+    loadLibraryOrExit("libicu");
 }

Modified: trunk/Source/_javascript_Core/shell/playstation/TestShell.cpp (263615 => 263616)


--- trunk/Source/_javascript_Core/shell/playstation/TestShell.cpp	2020-06-27 06:17:10 UTC (rev 263615)
+++ trunk/Source/_javascript_Core/shell/playstation/TestShell.cpp	2020-06-27 14:18:34 UTC (rev 263616)
@@ -25,8 +25,21 @@
 
 #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 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[])

Modified: trunk/Tools/ChangeLog (263615 => 263616)


--- trunk/Tools/ChangeLog	2020-06-27 06:17:10 UTC (rev 263615)
+++ trunk/Tools/ChangeLog	2020-06-27 14:18:34 UTC (rev 263616)
@@ -1,3 +1,12 @@
+2020-06-27  Stephan Szabo  <stephan.sz...@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  <jbed...@apple.com>
 
         [webkitpy] Allow callers to override the reported model (Part 1)

Modified: trunk/Tools/Scripts/webkitdirs.pm (263615 => 263616)


--- trunk/Tools/Scripts/webkitdirs.pm	2020-06-27 06:17:10 UTC (rev 263615)
+++ trunk/Tools/Scripts/webkitdirs.pm	2020-06-27 14:18:34 UTC (rev 263616)
@@ -502,7 +502,7 @@
     my $jscName = "jsc";
     $jscName .= "_debug"  if configuration() eq "Debug_All";
     if (isPlayStation()) {
-        $jscName .= ".elf";
+        $jscName .= ".self";
     } elsif (isAnyWindows()) {
         $jscName .= ".exe";
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to