8000 minor #17189 [Process] Fix running tests on HHVM>=3.8 (nicolas-grekas) · symfony/symfony@5ff8713 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5ff8713

Browse files
nicolas-grekasnicolas-grekas
committed
minor #17189 [Process] Fix running tests on HHVM>=3.8 (nicolas-grekas)
This PR was merged into the 2.3 branch. Discussion ---------- [Process] Fix running tests on HHVM>=3.8 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - open_basedir works correctly since hhvm 3.8 Commits ------- a47208b [Process] Fix running tests on HHVM>=3.8
2 parents 675bace + a47208b commit 5ff8713

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services: mongodb
3232

3333
before_install:
3434
- if [[ ! $deps && ! $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} && $TRAVIS_PHP_VERSION != hhvm && $TRAVIS_PULL_REQUEST != false ]]; then deps=skip; fi;
35-
- if [[ ! $deps && ! -d php-$MIN_PHP/sapi ]]; then wget http://museum.php.net/php5/php-$MIN_PHP.tar.bz2 -O - | tar -xj; (cd php-$MIN_PHP; ./configure --enable-sigchild --enable-pcntl; make -j2); fi;
35+
- if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then wget http://museum.php.net/php5/php-$MIN_PHP.tar.bz2 -O - | tar -xj; (cd php-$MIN_PHP; ./configure --enable-sigchild --enable-pcntl; make -j2); fi;
3636
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then INI_FILE=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; else INI_FILE=/etc/hhvm/php.ini; fi;
3737
- echo memory_limit = -1 >> $INI_FILE
3838
- echo session.gc_probability = 0 >> $INI_FILE

‎src/Symfony/Component/Process/Tests/ExecutableFinderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function testFindWithOpenBaseDir()
9999
$this->markTestSkipped('Cannot test when open_basedir is set');
100100
}
101101

102-
$this->iniSet('open_basedir', dirname(PHP_BINARY).(!defined('HHVM_VERSION') ? PATH_SEPARATOR.'/' : ''));
102+
$this->iniSet('open_basedir', dirname(PHP_BINARY).(!defined('HHVM_VERSION') || HHVM_VERSION_ID >= 30800 ? PATH_SEPARATOR.'/' : ''));
103103

104104
$finder = new ExecutableFinder();
105105
$result = $finder->find($this->getPhpBinaryName());
@@ -120,7 +120,7 @@ public function testFindProcessInOpenBasedir()
120120
}
121121

122122
$this->setPath('');
123-
$this->iniSet('open_basedir', PHP_BINARY.(!defined('HHVM_VERSION') ? PATH_SEPARATOR.'/' : ''));
123+
$this->iniSet('open_basedir', PHP_BINARY.(!defined('HHVM_VERSION') || HHVM_VERSION_ID >= 30800 ? PATH_SEPARATOR.'/' : ''));
124124

125125
$finder = new ExecutableFinder();
126126
$result = $finder->find($this->getPhpBinaryName(), false);

0 commit comments

Comments
 (0)
0