Merge branch 'master' into php5

* master:
  Prevent segfault on PHP 5.3.3 by disabling GC.
This commit is contained in:
Andreas Fischer 2014-04-11 00:45:37 +02:00
commit 1313009c9c

View File

@ -7,7 +7,14 @@ export PHPSECLIB_SSH_USERNAME='phpseclib'
export PHPSECLIB_SSH_PASSWORD='EePoov8po1aethu2kied1ne0' export PHPSECLIB_SSH_PASSWORD='EePoov8po1aethu2kied1ne0'
export PHPSECLIB_SSH_HOME='/home/phpseclib' export PHPSECLIB_SSH_HOME='/home/phpseclib'
PHPUNIT_EXTRA_ARGS=''
if [ "$TRAVIS_PHP_VERSION" = '5.3.3' ]
then
PHPUNIT_EXTRA_ARGS="$PHPUNIT_EXTRA_ARGS -d zend.enable_gc=0"
fi
phpunit \ phpunit \
$PHPUNIT_EXTRA_ARGS \
--verbose \ --verbose \
--coverage-text \ --coverage-text \
--coverage-html code_coverage/ --coverage-html code_coverage/