Attachment 349302 Details for Bug 185766 – Patch

[patch] Patch

bug-185766-20180910105309.patch (text/plain), 1.75 KB, created by Dominik Inführ on 2018-09-10 01:53:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dominik Inführ

Created: 2018-09-10 01:53:10 PDT

Size: 1.75 KB

patch

obsolete

>Subversion Revision: 235841
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 80e5b8e482c19c9e5d5b1ec6955d71c28922ec40..772eb321c093ad55809781bb132449a6b557d3d8 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-10  Dominik Infuehr  <dinfuehr@igalia.com>
>+
>+        Do not assume build directory resides in source directory
>+        https://bugs.webkit.org/show_bug.cgi?id=185766
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WEBKIT_PATH points to source directory, the regex therefore doesn't match if the build
>+        directory doesn't reside in the source directory. As a consequence dependencies are
>+        not copied onto remote machines.
>+
>+        * Scripts/run-jsc-stress-tests:
>+
> 2018-09-09  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r235832.
>diff --git a/Tools/Scripts/run-jsc-stress-tests b/Tools/Scripts/run-jsc-stress-tests
>index b791df8fa7af804d284f619e02764154094b3d60..a1250b48fa6129eaa7329b292b67d9a9a389791b 100755
>--- a/Tools/Scripts/run-jsc-stress-tests
>+++ b/Tools/Scripts/run-jsc-stress-tests
>@@ -1655,10 +1655,10 @@ def prepareBundle
>                     dependencies = `ldd #{source}`
>                     dependencies.split(/\n/).each {
>                         | dependency |
>-                        FileUtils.cp_r $&, $jscPath.dirname if dependency =~ /#{WEBKIT_PATH}[^ ]*/
>+                        FileUtils.cp_r $&, $jscPath.dirname if dependency =~ /#{originalJSCPath.dirname.dirname}[^ ]*/
>                     }
>                 rescue
>-                    $stderr.puts "Warning: unable to determine or copy library dependnecies of JSC."
>+                    $stderr.puts "Warning: unable to determine or copy library dependencies of JSC."
>                 end
>             end
>         }

Actions: View | Formatted Diff | Diff

Attachments on bug 185766: 340693 | 340732 | 349301 | 349302