Changeset 48931 in webkit

Timestamp:

Sep 30, 2009 10:15:22 AM (15 years ago)

Author:

ddkilzer@apple.com

Message:

2009-09-30 Csaba Osztrogonac <​oszi@inf.u-szeged.hu>

Reviewed by David Kilzer.

Make sunspider scripts work on Windows platform.
​https://bugs.webkit.org/show_bug.cgi?id=29656

• Scripts/run-sunspider: Perl scripts invoked with same Perl interpreter.
• Scripts/sunspider-compare-results: Perl scripts invoked with same Perl interpreter.
• Scripts/webkitdirs.pm: currentPerlPath() added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-sunspider (modified) (2 diffs)
• Scripts/sunspider-compare-results (modified) (2 diffs)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-30  Csaba Osztrogonac  <oszi@inf.u-szeged.hu>
+
+        Reviewed by David Kilzer.
+
+        Make sunspider scripts work on Windows platform.
+        https://bugs.webkit.org/show_bug.cgi?id=29656
+
+        * Scripts/run-sunspider: Perl scripts invoked with same Perl interpreter.
+        * Scripts/sunspider-compare-results: Perl scripts invoked with same Perl interpreter.
+        * Scripts/webkitdirs.pm: currentPerlPath() added.
+
 2009-09-29  Brady Eidson  <beidson@apple.com>
 

trunk/WebKitTools/Scripts/run-sunspider

@@ -88 +88 @@
         
         chdirWebKit();
-        my $buildResult = system "WebKitTools/Scripts/build-jsc", @ARGV;
+        my $buildResult = system currentPerlPath(), "WebKitTools/Scripts/build-jsc", @ARGV;
         if ($buildResult) {
             print STDERR "Compiling jsc failed!\n";
@@ -134 +134 @@
 push @args, "--tests", $testsPattern if $testsPattern;
 
-exec "./sunspider", @args;
+exec currentPerlPath(), "./sunspider", @args;

trunk/WebKitTools/Scripts/sunspider-compare-results

@@ -68 +68 @@
     if (!defined($root)){
         chdirWebKit();
-        my $buildResult = system "WebKitTools/Scripts/build-jsc", "--" . $configuration;
+        my $buildResult = system currentPerlPath(), "WebKitTools/Scripts/build-jsc", "--" . $configuration;
         if ($buildResult) {
             print STDERR "Compiling jsc failed!\n";
@@ -125 +125 @@
 push @args, "--v8" if $v8;
 
-exec "./sunspider-compare-results", @args, @ARGV;
+exec currentPerlPath(), "./sunspider-compare-results", @args, @ARGV;

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -30 +30 @@
 use strict;
 use warnings;
+use Config;
 use FindBin;
 use File::Basename;
@@ -84 +85 @@
 
     $sourceDir = "$sourceDir/OpenSource" if -d "$sourceDir/OpenSource";
+}
+
+sub currentPerlPath()
+{
+    my $thisPerl = $^X;
+    if ($^O ne 'VMS') {
+        $thisPerl .= $Config{_exe} unless $thisPerl =~ m/$Config{_exe}$/i;
+    }
+    return $thisPerl;
 }