aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-05-03 23:16:43 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-05-09 18:46:29 +0200
commitb5b1e88915ae8ae220c62b0d27f514069c3c0249 (patch)
treed4a59deb86ac4a958c7590671e7722e4a3c0185d
parenta42514105d710bf16f30fed467418128501ca88e (diff)
downloadforums-b5b1e88915ae8ae220c62b0d27f514069c3c0249.tar
forums-b5b1e88915ae8ae220c62b0d27f514069c3c0249.tar.gz
forums-b5b1e88915ae8ae220c62b0d27f514069c3c0249.tar.bz2
forums-b5b1e88915ae8ae220c62b0d27f514069c3c0249.tar.xz
forums-b5b1e88915ae8ae220c62b0d27f514069c3c0249.zip
[ticket/11513] Use PHPUnit from composer in .travis.yml.
PHPBB3-11513
-rw-r--r--.travis.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 0bb6920412..093719528d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,17 +18,15 @@ before_script:
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
- - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then pyrus set auto_discover 1; fi"
- - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; else pyrus install --force phpunit/DbUnit; fi"
- - phpenv rehash
+ - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi"
- cd phpBB
- sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev; fi"
- cd ..
- sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
script:
- - phpunit --configuration travis/phpunit-$DB-travis.xml
-
+ - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
+
notifications:
email:
recipients: