[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[slewis at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 5bee7c3435e1ca07169cce75863fde43e0b906d0
Author: slewis at apple.com <slewis at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 21:38:32 2010 +0000

    SunSpider: http://bugs.webkit.org/show_bug.cgi?id=42406
    Output location of results file.
    
    Reviewed by Geoff Garen.
    
    * sunspider:
    
    WebKitTools: http://bugs.webkit.org/show_bug.cgi?id=42406
    Make SunSpider work better with roots.
    
    Reviewed by Geoff Garen.
    
    * Scripts/sunspider-compare-results: fix argument bug
    * Scripts/webkitdirs.pm: look inside JavaScriptCore if jsc isn't top-level.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63463 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index 4681355..b4bbc3c 100644
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-15  Stephanie Lewis  <slewis at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        http://bugs.webkit.org/show_bug.cgi?id=42406
+        Output location of results file.
+
+        * sunspider:
+
 2010-05-17  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 97a86f1..dedc88f 100755
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -229,6 +229,8 @@ dumpToFile(File::Spec->rel2abs($resultsFile), "$resultDirectory/baseline-filenam
 
 system("$jsShellPath", "-f", $prefixFile, "-f", $resultsFile, "-f", "resources/sunspider-analyze-results.js");
 
+print("\nResults are located at $resultsFile\n");
+
 if ($runShark) {
     my $newestMShark = newestFile(".", qr/\.mshark$/);
     if ($newestMShark) {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e37e0f6..6bc4e0c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-15  Stephanie Lewis  <slewis at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        http://bugs.webkit.org/show_bug.cgi?id=42406
+        Make SunSpider work better with roots.
+
+        * Scripts/sunspider-compare-results: fix argument bug
+        * Scripts/webkitdirs.pm: look inside JavaScriptCore if jsc isn't top-level.
+
 2010-07-15  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/Scripts/sunspider-compare-results b/WebKitTools/Scripts/sunspider-compare-results
index 3446cd8..8c3f7f5 100755
--- a/WebKitTools/Scripts/sunspider-compare-results
+++ b/WebKitTools/Scripts/sunspider-compare-results
@@ -55,7 +55,7 @@ Usage: $programName [options] FILE FILE
   --parse-only      Use the parse-only benchmark suite. Same as --suite=parse-only
 EOF
 
-GetOptions('root=s' => sub { my ($argName, $value); setConfigurationProductDir(Cwd::abs_path($value)); },
+GetOptions('root=s' => sub { my ($argName, $value) = @_; setConfigurationProductDir(Cwd::abs_path($value)); },
            'suite=s' => \$suite,
            'ubench' => \$ubench,
            'v8' => \$v8,
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 674dc8c..1bd0b59 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -258,7 +258,8 @@ sub jscPath($)
     my ($productDir) = @_;
     my $jscName = "jsc";
     $jscName .= "_debug"  if (isCygwin() && ($configuration eq "Debug"));
-    return "$productDir/$jscName";
+    return "$productDir/$jscName" if -e "$productDir/$jscName";
+    return "$productDir/JavaScriptCore.framework/Resources/$jscName";
 }
 
 sub argumentsForConfiguration()

-- 
WebKit Debian packaging