Merge branch 'master' into php5

* master:
  Run HHVM tests in parallel.
This commit is contained in:
Andreas Fischer 2014-12-14 01:51:44 +01:00
commit 16503848a4
2 changed files with 15 additions and 8 deletions

View File

@ -19,6 +19,7 @@ env:
before_install: true before_install: true
install: install:
- sudo apt-get install parallel
- eval `ssh-agent -s` - eval `ssh-agent -s`
- travis/setup-secure-shell.sh - travis/setup-secure-shell.sh
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi"

View File

@ -14,15 +14,21 @@ else
PHPUNIT="$(dirname "$0")/../vendor/bin/phpunit" PHPUNIT="$(dirname "$0")/../vendor/bin/phpunit"
fi fi
PHPUNIT_EXTRA_ARGS='' PHPUNIT_ARGS='--verbose'
if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.4', '<');"` = "1" ] if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.4', '<');"` = "1" ]
then then
PHPUNIT_EXTRA_ARGS="$PHPUNIT_EXTRA_ARGS -d zend.enable_gc=0" PHPUNIT_ARGS="$PHPUNIT_ARGS -d zend.enable_gc=0"
fi fi
"$PHPUNIT" \ if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
$PHPUNIT_EXTRA_ARGS \ then
--verbose \ find tests -type f -name "*Test.php" | \
--coverage-text \ parallel --gnu --keep-order \
--coverage-clover code_coverage/clover.xml \ "echo '== {} =='; \"$PHPUNIT\" $PHPUNIT_ARGS {};"
--coverage-html code_coverage/ else
"$PHPUNIT" \
$PHPUNIT_ARGS \
--coverage-text \
--coverage-clover code_coverage/clover.xml \
--coverage-html code_coverage/
fi