[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mjs at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 184b116edcea6387ff58d114cf227022c232d531
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 06:24:53 2009 +0000

    2009-12-14  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Eric Seidel.
    
            Make sunspider-0.9.1 the default content set (both command-line and hosted)
            https://bugs.webkit.org/show_bug.cgi?id=32537
    
            * hosted/sunspider.html: Change default suite link.
            * sunspider: Change default suite.
            * sunspider-compare-results: Likewise.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52137 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index b5b32e0..f15b7e7 100644
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,5 +1,16 @@
 2009-12-14  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Eric Seidel.
+
+        Make sunspider-0.9.1 the default content set (both command-line and hosted)
+        https://bugs.webkit.org/show_bug.cgi?id=32537
+
+        * hosted/sunspider.html: Change default suite link.
+        * sunspider: Change default suite.
+        * sunspider-compare-results: Likewise.
+
+2009-12-14  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Sam Weinig.
 
         in-browser SunSpider suffers excessive penalty under power management
diff --git a/SunSpider/hosted/sunspider.html b/SunSpider/hosted/sunspider.html
index 9e7101e..3aee4d2 100644
--- a/SunSpider/hosted/sunspider.html
+++ b/SunSpider/hosted/sunspider.html
@@ -69,7 +69,7 @@ significant.</dd>
 
 </dl>
 
-<p><b>Current version - sunspider-0.9:</b> <a href="sunspider-0.9/driver.html">Start Now!</a><br>
+<p><b>Current version - sunspider-0.9.1:</b> <a href="sunspider-0.9.1/driver.html">Start Now!</a><br>
 <small>(When you run the benchmark, be patient - it loops through all of the
 test cases five times and can take a minute or longer to complete.)</small></p>
 
diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 2f42f46..97a86f1 100755
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -58,7 +58,7 @@ Usage: $programName --shell=[path] [options]
   --shark           Sample execution time with the Mac OS X "Shark" performance testing tool (implies --runs=1)
   --shark20         Like --shark, but with a 20 microsecond sampling interval
   --shark-cache     Like --shark, but performs a L2 cache-miss sample instead of time sample
-  --suite           Select a specific benchmark suite. The default is sunspider-0.9
+  --suite           Select a specific benchmark suite. The default is sunspider-0.9.1
   --ubench          Use microbenchmark suite instead of regular tests. Same as --suite=ubench
   --v8-suite        Use the V8 benchmark suite. Same as --suite=v8-v4
   --parse-only      Use the parse-only benchmark suite. Same as --suite=parse-only
@@ -82,7 +82,7 @@ GetOptions('runs=i' => \$testRuns,
 $suite = "ubench" if ($ubench);
 $suite = "v8-v4" if ($v8suite);
 $suite = "parse-only" if ($parseOnly);
-$suite = "sunspider-0.9" if (!$suite);
+$suite = "sunspider-0.9.1" if (!$suite);
 
 my $resultDirectory = "${suite}-results";
 
diff --git a/SunSpider/sunspider-compare-results b/SunSpider/sunspider-compare-results
index 213c699..09b7052 100755
--- a/SunSpider/sunspider-compare-results
+++ b/SunSpider/sunspider-compare-results
@@ -39,7 +39,7 @@ my $usage = <<EOF;
 Usage: $programName --shell=[path] [options] FILE FILE
   --help        Show this help message
   --shell       Path to javascript shell
-  --suite           Select a specific benchmark suite. The default is sunspider-0.9
+  --suite           Select a specific benchmark suite. The default is sunspider-0.9.1
   --ubench          Use microbenchmark suite instead of regular tests. Same as --suite=ubench
   --v8-suite        Use the V8 benchmark suite. Same as --suite=v8-v4
   --parse-only  Compare the parse-only benchmark results
@@ -55,7 +55,7 @@ GetOptions('shell=s' => \$jsShellPath,
 $suite = "ubench" if ($ubench);
 $suite = "v8-v4" if ($v8suite);
 $suite = "parse-only" if ($parseOnly);
-$suite = "sunspider-0.9" if (!$suite);
+$suite = "sunspider-0.9.1" if (!$suite);
 
 my $resultDirectory = "${suite}-results";
 

-- 
WebKit Debian packaging