Changeset 231122 in webkit

Timestamp:

Apr 27, 2018 5:21:55 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo] Support --no-copy for jsc tests in wincairo tests, add copying of dlls for copy case
​https://bugs.webkit.org/show_bug.cgi?id=185049

Patch by Stephan Szabo <​stephan.szabo@sony.com> on 2018-04-27
Reviewed by Keith Miller.

• Scripts/run-javascriptcore-tests:

(runJSCStressTests):

• Scripts/run-jsc-stress-tests:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (6 diffs)
• Scripts/run-jsc-stress-tests (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-04-27  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [WinCairo] Support --no-copy for jsc tests in wincairo tests, add copying of dlls for copy case
+        https://bugs.webkit.org/show_bug.cgi?id=185049
+
+        Reviewed by Keith Miller.
+
+        * Scripts/run-javascriptcore-tests:
+        (runJSCStressTests):
+        * Scripts/run-jsc-stress-tests:
+
 2018-04-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -59 +59 @@
 
 my $buildJSC = 1;
+my $copyJSC = 1;
 
 use constant {
@@ -146 +147 @@
         print "Don't recognize value for RUN_JAVASCRIPTCORE_TESTS_BUILD environment variable: '"
             . $ENV{RUN_JAVASCRIPTCORE_TESTS_BUILD} . "'. Should be set to 'true' or 'false'.\n";
+    }
+}
+
+if ($ENV{RUN_JAVASCRIPTCORE_TESTS_COPY}) {
+    if ($ENV{RUN_JAVASCRIPTCORE_TESTS_COPY} eq "true") {
+        $copyJSC = 1;
+    } elsif ($ENV{RUN_JAVASCRIPTCORE_TESTS_COPY} eq "false") {
+        $copyJSC = 0;
+    } else {
+        print "Don't recognize value for RUN_JAVASCRIPTCORE_TESTS_COPY environment variable: '"
+            . $ENV{RUN_JAVASCRIPTCORE_TESTS_COPY} . "'. Should be set to 'true' or 'false'.\n";
     }
 }
@@ -175 +187 @@
 my $quickModeDefault = $runQuickMode ? "some" : "all";
 my $failFastDefault = $failFast ? "fail fast" : "don't fail fast";
+my $copyJSCDefault = $copyJSC ? "copy" : "do not copy";
 my $filter;
 my $usage = <<EOF;
@@ -195 +208 @@
   --[no-]fail-fast              Stop this script when a test family reports an error or failure (default: $failFastDefault)
   --[no-]force-collectContinuously Enable the collectContinuously mode even if it was disabled on this platform.
+  --[no-]copy                   Copy (or don't copy) the JavaScriptCore build product before testing (default: $copyJSCDefault)
   --json-output=                Create a file at specified path, listing failed stress tests in JSON format.
   --tarball                     Create a tarball of the bundle produced by running the JSC stress tests.
@@ -249 +263 @@
     'fail-fast!' => \$failFast,
     'force-collectContinuously!' => \$forceCollectContinuously,
+    'copy!' => \$copyJSC,
     'json-output=s' => \$jsonFileName,
     'tarball!' => \$createTarball,
@@ -438 +453 @@
     }
     
+    if (!$copyJSC) {
+        push(@jscStressDriverCmd, "--no-copy");
+    }
+
     if ($forceCollectContinuously) {
         push(@jscStressDriverCmd, "--force-collectContinuously");

trunk/Tools/Scripts/run-jsc-stress-tests

@@ -1580 +1580 @@
     if $doNotMessWithVMPath
         if !$remote and !$tarball
-            $testingFrameworkPath = frameworkFromJSCPath($jscPath).realpath
+            $testingFrameworkPath = (frameworkFromJSCPath($jscPath) || $jscPath.dirname).realpath
             $jscPath = Pathname.new($jscPath).realpath
         else
@@ -1600 +1600 @@
         elsif $hostOS == "windows"
             # Make sure to copy dll along with jsc on Windows
-            source = [originalJSCPath] + Dir.glob(File.dirname(originalJSCPath) + "/jscLib.dll")
+            originalJSCDir = File.dirname(originalJSCPath)
+            source = [originalJSCPath] + [originalJSCDir + "/jscLib.dll"]
+
+            # Check for and copy JavaScriptCore.dll and WTF.dll for dynamic builds
+            javaScriptCoreDLLPath = File.join(originalJSCDir, "JavaScriptCore.dll")
+            wtfDLLPath = File.join(originalJSCDir, "WTF.dll")
+            if (File.exists?(javaScriptCoreDLLPath))
+                source = source + [javaScriptCoreDLLPath]
+            end
+            if (File.exists?(wtfDLLPath))
+                source = source + [wtfDLLPath]
+            end
+
             destination = $jscPath.dirname