[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

xan at webkit.org xan at webkit.org
Fri Jan 21 15:04:46 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 1ea21a3533d76fbe13486240779ec48bfb2a3e12
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 22:01:35 2011 +0000

    2011-01-06  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Darin Adler.
    
            File::Spec->rel2abs in sunspider-compare-results mangles parameters
            https://bugs.webkit.org/show_bug.cgi?id=52015
    
            * Scripts/sunspider-compare-results: call rel2abs on our arguments
            after the platform has been detected, otherwise the script will
            mangle things like '--gtk' into '/a/path/--gtk', breaking the
            detection.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 08adac0..c10120b 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-06  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Darin Adler.
+
+        File::Spec->rel2abs in sunspider-compare-results mangles parameters
+        https://bugs.webkit.org/show_bug.cgi?id=52015
+
+        * Scripts/sunspider-compare-results: call rel2abs on our arguments
+        after the platform has been detected, otherwise the script will
+        mangle things like '--gtk' into '/a/path/--gtk', breaking the
+        detection.
+
 2011-01-06  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/Tools/Scripts/sunspider-compare-results b/Tools/Scripts/sunspider-compare-results
index 83ade73..ce95944 100755
--- a/Tools/Scripts/sunspider-compare-results
+++ b/Tools/Scripts/sunspider-compare-results
@@ -67,8 +67,6 @@ if ($showHelp) {
    exit 1;
 }
 
- at ARGV = map { File::Spec->rel2abs($_) } @ARGV;
-
 sub buildJSC
 {
     if (!defined($root)){
@@ -130,4 +128,6 @@ push @args, "--ubench" if $ubench;
 push @args, "--v8" if $v8;
 push @args, "--parse-only" if $parseonly;
 
+ at ARGV = map { File::Spec->rel2abs($_) } @ARGV;
+
 exec currentPerlPath(), "./sunspider-compare-results", @args, @ARGV;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list