Changeset 247808 in webkit

Timestamp:

Jul 24, 2019 7:00:37 PM (5 years ago)

Author:

Fujii Hironori

Message:

[webkitperl] runCommand doesn't work in Windows Perl
​https://bugs.webkit.org/show_bug.cgi?id=199900

Reviewed by Don Olmstead.

runCommand was always failing implicit fork by using 'open' with
'-|' in Windows Perl. Explicitly specify the command to 'open' not
to do the implicit fork.

There is one more difference between Windows and Unix. 'open'
successes on Windows even for non existent command while it fails
on Unix. So, return the same error code on Unix as well as
Windows.

• Scripts/VCSUtils.pm: Specified the command to 'open'.
• Scripts/webkitperl/VCSUtils_unittest/runCommand.pl: 'echo'

command is not available on Windows. Use Perl ($^{X) instead.}

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (1 diff)
• Scripts/webkitperl/VCSUtils_unittest/runCommand.pl (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-24  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [webkitperl] runCommand doesn't work in Windows Perl
+        https://bugs.webkit.org/show_bug.cgi?id=199900
+
+        Reviewed by Don Olmstead.
+
+        runCommand was always failing implicit fork by using 'open' with
+        '-|' in Windows Perl. Explicitly specify the command to 'open' not
+        to do the implicit fork.
+
+        There is one more difference between Windows and Unix. 'open'
+        successes on Windows even for non existent command while it fails
+        on Unix. So, return the same error code on Unix as well as
+        Windows.
+
+        * Scripts/VCSUtils.pm: Specified the command to 'open'.
+        * Scripts/webkitperl/VCSUtils_unittest/runCommand.pl: 'echo'
+        command is not available on Windows. Use Perl ($^X) instead.
+
 2019-07-24  Priyanka Agarwal  <pagarwal999@apple.com>
 

trunk/Tools/Scripts/VCSUtils.pm

@@ -2399 +2399 @@
 sub runCommand(@)
 {
-    my @args = @_;
-    my $pid = open(CHILD, "-|");
-    if (!defined($pid)) {
-        die "Failed to fork(): $!";
-    }
-    if ($pid) {
-        # Parent process
-        my $childStdout;
-        while (<CHILD>) {
-            $childStdout .= $_;
-        }
-        close(CHILD);
-        my %childOutput;
-        $childOutput{exitStatus} = exitStatus($?);
-        $childOutput{stdout} = $childStdout if $childStdout;
-        return \%childOutput;
-    }
-    # Child process
     # FIXME: Consider further hardening of this function, including sanitizing the environment.
-    exec { $args[0] } @args or die "Failed to exec(): $!";
+    my $ok = open(CHILD, "-|", @_);
+    if (!$ok) {
+        return { exitStatus => 1 };
+    }
+    my $childStdout;
+    while (<CHILD>) {
+        $childStdout .= $_;
+    }
+    close(CHILD);
+    my %childOutput;
+    $childOutput{exitStatus} = exitStatus($?);
+    $childOutput{stdout} = $childStdout if $childStdout;
+    return \%childOutput;
 }
 

trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/runCommand.pl

@@ -31 +31 @@
 use VCSUtils;
 
-use constant ENOENT => 2; # See <errno.h>
-
 # The array of test cases.
 my @testCaseHashRefs = (
@@ -38 +36 @@
     # New test
     testName => "Simple",
-    inputArgs => ["echo", "hello"],
+    inputArgs => [$^X, "-e", "print \@ARGV", "hello"],
     expectedReturn => {
         exitStatus => 0,
-        stdout => "hello\n"
+        stdout => "hello"
     }
 },
@@ -47 +45 @@
     # New test
     testName => "Multiple commands",
-    inputArgs => ["echo", "first-command;echo second-command"],
+    inputArgs => [$^X, "-e", "print \@ARGV", "first-command;echo second-command"],
     expectedReturn => {
         exitStatus => 0,
-        stdout => "first-command;echo second-command\n"
+        stdout => "first-command;echo second-command"
     }
 },
@@ -58 +56 @@
     inputArgs => ["/usr/bin/non-existent-command"],
     expectedReturn => {
-        exitStatus => ENOENT
+        exitStatus => 1
     }
 }