merged branch romainneutron/ProcessExitCode (PR #5386)

fabpot · fabpot · commit 569e29d91fd3 · 2012-08-30T15:04:53.000+02:00
Commits ------- 407db65 Add @Seldaek remote modifications 3bfb976 Add unit test demonstrating bad exit code getter for a failing process Discussion ---------- Add unit test demonstrating bad exit code getter for a failing process Since 7b63428698 exit code are not well handled anymore. The unit test provided with this PR demonstrates it --------------------------------------------------------------------------- by fabpot at 2012-08-30T11:05:05Z ping @Seldaek --------------------------------------------------------------------------- by stof at 2012-08-30T11:13:13Z We probably need to enable the workaround only when sigchild is used. --------------------------------------------------------------------------- by Seldaek at 2012-08-30T12:51:22Z Ok I figured out the problem, the hack is even hackier I guess now, but it should work for people with and without --enable-sigchild at least.
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -218,7 +218,7 @@ public function start($callback = null)
                 array('pipe', 'w'), // stderr
                 array('pipe', 'w')  // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
             );
-            $this->commandline = '('.$this->commandline.') 3>/dev/null; echo $? >&3';
+            $this->commandline = '('.$this->commandline.') 3>/dev/null; code=$?; echo $code >&3; exit $code';
         }
 
         $commandline = $this->commandline;
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -89,6 +89,19 @@ public function testCallbackIsExecutedForOutput()
         $this->assertTrue($called, 'The callback should be executed with the output');
     }
 
+    public function testExitCodeCommandFailed()
+    {
+        if (strpos(PHP_OS, "WIN") === 0) {
+            $this->markTestSkipped('Windows does not support POSIX exit code');
+        }
+
+        // such command run in bash return an exitcode 127
+        $process = new Process('nonexistingcommandIhopeneversomeonewouldnameacommandlikethis');
+        $process->run();
+
+        $this->assertGreaterThan(0, $process->getExitCode());
+    }
+
     public function testExitCodeText()
     {
         $process = new Process('');

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public function start($callback = null)`
`218`	`218`	`array('pipe', 'w'), // stderr`
`219`	`219`	`array('pipe', 'w') // last exit code is output on the fourth pipe and caught to work around --enable-sigchild`
`220`	`220`	`);`
`221`		`- $this->commandline = '('.$this->commandline.') 3>/dev/null; echo $? >&3';`
	`221`	`+ $this->commandline = '('.$this->commandline.') 3>/dev/null; code=$?; echo $code >&3; exit $code';`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`$commandline = $this->commandline;`