Merge pull request #1348 from D-storm/travis

use phpunit 4.1.x for testing (Travis)
This commit is contained in:
Marc Delisle 2014-08-31 08:06:08 -04:00
commit 104756e0a5
3 changed files with 7 additions and 6 deletions

View File

@ -23,6 +23,9 @@ before_script:
- export PATH=~/.composer/vendor/bin/:$PATH
- mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')" ;
- set -e ; if [[ -z "$LINT" ]] ; then
composer install --dev --no-interaction ;
if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then
if [[ $TRAVIS_PHP_VERSION != "5.6" ]] ; then
@ -37,8 +40,6 @@ before_script:
phpenv config-add test/travis.php.ini ;
fi
composer install --dev --no-interaction ;
wget https://scrutinizer-ci.com/ocular.phar ;
fi ;

View File

@ -24,19 +24,19 @@
</target>
<target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
<exec executable="phpunit" failonerror="true">
<exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
<arg line="--configuration ${env.PHPUNIT_XML} ${env.PHPUNIT_ARGS}"/>
</exec>
</target>
<target name="phpunit-nocoverage" description="Run unit tests using PHPUnit and generates junit.xml">
<exec executable="phpunit" failonerror="true">
<exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
<arg line="--configuration ${env.PHPUNIT_XML_NOCOVERAGE} ${env.PHPUNIT_ARGS}"/>
</exec>
</target>
<target name="phpunit-hhvm" description="Run unit tests using PHPUnit with HHVM specific config">
<exec executable="phpunit" failonerror="true">
<exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
<arg line="--configuration ${env.PHPUNIT_XML_HHVM} ${env.PHPUNIT_ARGS}"/>
</exec>
</target>

View File

@ -23,7 +23,7 @@
},
"require-dev": {
"satooshi/php-coveralls": ">=0.6",
"phpunit/phpunit": ">=3.7",
"phpunit/phpunit": "<4.2",
"phpunit/phpunit-selenium": ">=1.2"
}
}