minor #18194 [travis] Run real php subprocesses on hhvm for Process component tests (nicolas-grekas)

fabpot · fabpot · commit 54f4f88fa447 · 2016-03-16T16:03:55.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [travis] Run real php subprocesses on hhvm for Process component tests | Q | A | ------------- | --- | Branch | 2.3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Let's see if this speeds up hhvm test matrix line. Commits ------- c722e35 [travis] Run real php subprocesses on hhvm for Process component tests
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ addons:
 env:
     global:
         - MIN_PHP=5.3.3
+        - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
 
 matrix:
     include:
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -30,7 +30,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
     public static function setUpBeforeClass()
     {
         $phpBin = new PhpExecutableFinder();
-        self::$phpBin = 'phpdbg' === PHP_SAPI ? 'php' : $phpBin->find();
+        self::$phpBin = getenv('SYMFONY_PROCESS_PHP_TEST_BINARY') ?: ('phpdbg' === PHP_SAPI ? 'php' : $phpBin->find());
         if ('\\' !== DIRECTORY_SEPARATOR) {
             // exec is mandatory to deal with sending a signal to the process
             // see https://github.com/symfony/symfony/issues/5030 about prepending

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase`
`30`	`30`	`public static function setUpBeforeClass()`
`31`	`31`	`{`
`32`	`32`	`$phpBin = new PhpExecutableFinder();`
`33`		`- self::$phpBin = 'phpdbg' === PHP_SAPI ? 'php' : $phpBin->find();`
	`33`	`+ self::$phpBin = getenv('SYMFONY_PROCESS_PHP_TEST_BINARY') ?: ('phpdbg' === PHP_SAPI ? 'php' : $phpBin->find());`
`34`	`34`	`if ('\\' !== DIRECTORY_SEPARATOR) {`
`35`	`35`	`// exec is mandatory to deal with sending a signal to the process`
`36`	`36`	`// see https://github.com/symfony/symfony/issues/5030 about prepending`