Reviewed by Adam.

[WebKit-https.git] / SunSpider / sunspider-compare-results

diff --git a/SunSpider/sunspider-compare-results b/SunSpider/sunspider-compare-results
index c6fa337..134c8ee 100755 (executable)
--- a/SunSpider/sunspider-compare-results
+++ b/SunSpider/sunspider-compare-results
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2007 Apple Inc.  All rights reserved.
+# Copyright (C) 2007 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -24,41 +24,58 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 use strict;
+use Getopt::Long;
 use File::Basename;
 
+my $showHelp = 0;
+my $jsShellPath;
+
 my $programName = basename($0);
 my $usage = <<EOF;
-Usage: $programName [file 1] [file 2]
+Usage: $programName --shell=[path] [options] FILE FILE
+  --help        Show this help message
+  --shell       Path to javascript shell
 EOF
 
-if (scalar @ARGV < 2) {
-    print STDERR $usage;
-    exit 1;
+GetOptions('shell=s' => \$jsShellPath,
+           'help' => \$showHelp);
+
+if (scalar @ARGV < 2 || !$jsShellPath || $showHelp) {
+   print STDERR $usage;
+   exit 1;
 }
 
 sub readResultsFile($)
 {
     my ($filename) = @_;
-    open FILE, "<${filename}";
+    open FILE, "<", $filename or die;
     my $foundStart = 0;
+    my $foundOutput = 0;
     my $foundEnd = 0;
     my $result = "";
     while (<FILE>) {
         if (!$foundStart) {
-           if (/^[[][{]$/) {
-               $foundStart = 1;
-               $result .= $_;
-           }
-       } else {
-           if (/^[}][]]$/) {
-               $foundEnd = 1;
-               chomp;
-               $result .= $_;
-               last;
-           } else {
-               $result .= $_;
-           }
-       } 
+            if (/^\[\{$/) {
+                $foundStart = 1;
+                $result .= $_;
+            } elsif (/^var \w+ = \[$/) {
+                $foundOutput = 1;
+            } elsif ($foundOutput && /^\{$/) {
+                $foundOutput = 0;
+                $foundStart = 1;
+                $result = "[{\n";
+            }
+        } else {
+            if (/\];?$/) {
+                $foundEnd = 1;
+                chomp;
+                s/;$//;
+                $result .= $_;
+                last;
+            } else {
+                $result .= $_;
+            }
+        } 
     }
     close FILE;
 
@@ -70,7 +87,7 @@ sub readResultsFile($)
 sub dumpToFile($$)
 {
     my ($contents, $path) = @_;
-    open FILE, ">$path";
+    open FILE, ">", $path or die;
     print FILE $contents;
     close FILE;
 }
@@ -80,8 +97,4 @@ $output .= "var output2 = " . readResultsFile($ARGV[1]) . ";\n";
 
 dumpToFile($output, "tmp/sunspider-comparison-data.js");
 
-my $jsShellPath = "/Users/mjs/Work/symroots/Release/testkjs";
-
-system("$jsShellPath", "-f", "tmp/sunspider-test-prefix.js", "-f", "tmp/sunspider-comparison-data.js", "-f", "resources/sunspider-compare-results.js");
-
-
+system($jsShellPath, "-f", "tmp/sunspider-test-prefix.js", "-f", "tmp/sunspider-comparison-data.js", "-f", "resources/sunspider-compare-results.js");