Attachment 349142 Details for Bug 189404 – Patch

[patch] Patch

bug-189404-20180907150959.patch (text/plain), 2.21 KB, created by Dominik Inführ on 2018-09-07 06:10:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dominik Inführ

Created: 2018-09-07 06:10:00 PDT

Size: 2.21 KB

patch

obsolete

>Subversion Revision: 235780
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 051a402d080716e6b9de3aadddf5cc4f83d12426..2304adce1e38812042c9a201586ebcb1842ada11 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-09-07  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-09-06  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Add support for min/max-height percentage values.
>diff --git a/Tools/Scripts/run-jsc-benchmarks b/Tools/Scripts/run-jsc-benchmarks
>index 4da1c6c6d018d08a93acb7368b973d3daf757a63..720ba3c2bbb5e29e2aeaa051ac8b79be882c1255 100755
>--- a/Tools/Scripts/run-jsc-benchmarks
>+++ b/Tools/Scripts/run-jsc-benchmarks
>@@ -1380,9 +1380,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]+)$/
>@@ -1412,7 +1412,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