Attachment 357435 Details for Bug 189404 – Patch

[patch] Patch

bug-189404-20181217133754.patch (text/plain), 2.20 KB, created by Dominik Inführ on 2018-12-17 04:37:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Dominik Inführ

Created: 2018-12-17 04:37:55 PST

Size: 2.20 KB

patch

obsolete

>Subversion Revision: 239262
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e5b9339a7691ec3e4cbf2f957ec19ff5a0cbcec1..76fb3cd7884f6fcc74c188f2b604f9dc76963d77 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-12-17  Dominik Infuehr  <dinfuehr@igalia.com>
>+
>+        Also copy JSC when running benchmarks on remote machine
>+        https://bugs.webkit.org/show_bug.cgi?id=189404
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/run-jsc-benchmarks:
>+
> 2018-12-16  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         Unreviewed build fix after r239253
>diff --git a/Tools/Scripts/run-jsc-benchmarks b/Tools/Scripts/run-jsc-benchmarks
>index 2ccfe923d30e50b7b209a2480432e672f6cb3ed0..a186a6eb28c1a3c12f55a8d29c6787a3745edff7 100755
>--- a/Tools/Scripts/run-jsc-benchmarks
>+++ b/Tools/Scripts/run-jsc-benchmarks
>@@ -1382,9 +1382,9 @@ class VM
>     elsif @path =~ /\/Debug\/([a-zA-Z]+)$/
>       @libPath, @relativeBinPath = [$~.pre_match+"/Debug"], "./#{$1}"
>     elsif @path =~ /\/Release\/bin(64|32|)\/([\.a-zA-Z]+)$/
>-      @libPath, @relativeBinPath = [$~.pre_match+"/Release/lib#{$1}"], "./#{$2}"
>+      @libPath, @relativeBinPath = [$~.pre_match+"/Release/lib#{$1}", @path], "./#{$2}"
>     elsif @path =~ /\/Debug\/bin(64|32|)\/([\.a-zA-Z]+)$/
>-      @libPath, @relativeBinPath = [$~.pre_match+"/Debug/lib#{$1}"], "./#{$2}"
>+      @libPath, @relativeBinPath = [$~.pre_match+"/Debug/lib#{$1}", @path], "./#{$2}"
>     elsif @path =~ /\/Contents\/Resources\/([a-zA-Z]+)$/
>       @libPath = [$~.pre_match + "/Contents/Resources", $~.pre_match + "/Contents/Frameworks"]
>     elsif @path =~ /\/JavaScriptCore.framework\/Resources\/([a-zA-Z]+)$/
>@@ -1414,7 +1414,11 @@ class VM
>     raise unless Dir.mkdir(filename)
>     @libPath.each {
>       | libPathPart |
>-      cmd = "cp -a #{Shellwords.shellescape(libPathPart)}/* #{Shellwords.shellescape(filename.to_s)}"
>+      if File.file?(libPathPart)
>+        cmd = "cp -a #{Shellwords.shellescape(libPathPart)} #{Shellwords.shellescape(filename.to_s)}"
>+      else
>+        cmd = "cp -a #{Shellwords.shellescape(libPathPart)}/* #{Shellwords.shellescape(filename.to_s)}"
>+      end
>       $stderr.puts ">> #{cmd}" if $verbosity>=2
>       raise unless system(cmd)
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 189404: 349141 | 349142 | 357435