mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
This commit is contained in:
Nils Adermann
2013-05-09 19:42:13 +02:00
parent dbb4a87b79 3fb536d7b7
commit 3327739290
6 changed files with 435 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/build.xml
View File

@@ -56,7 +56,8 @@
<target name="test" depends="clean,prepare,composer">
<exec dir="."
command="phpunit --log-junit build/logs/phpunit.xml
command="phpBB/vendor/bin/phpunit
--log-junit build/logs/phpunit.xml
--coverage-clover build/logs/clover.xml
--coverage-html build/coverage"
passthru="true" />
@@ -64,7 +65,8 @@
<target name="test-slow" depends="clean,prepare,composer">
<exec dir="."
command="phpunit --log-junit build/logs/phpunit.xml
command="phpBB/vendor/bin/phpunit
--log-junit build/logs/phpunit.xml
--configuration phpunit.xml.all
--group slow
--coverage-clover build/logs/clover-slow.xml