makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.

Browse source 
PHPBB3-11513
This commit is contained in:
Andreas Fischer 2013-05-09 18:58:31 +02:00
parent b5b1e88915
commit f2f97dd5e0
3 changed files with 9 additions and 7 deletions
Show stats 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"> <target name="test" depends="clean,prepare,composer">
<exec dir="." <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-clover build/logs/clover.xml
--coverage-html build/coverage" --coverage-html build/coverage"
passthru="true" /> passthru="true" />
@ -64,7 +65,8 @@
<target name="test-slow" depends="clean,prepare,composer"> <target name="test-slow" depends="clean,prepare,composer">
<exec dir="." <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 --configuration phpunit.xml.all
--group slow --group slow
--coverage-clover build/logs/clover-slow.xml --coverage-clover build/logs/clover-slow.xml

6
git-tools/merge.php
View file

@ -78,12 +78,12 @@ function work($pull_id, $remote)
add_remote($pull_user, 'phpbb3'); add_remote($pull_user, 'phpbb3');
run("git fetch $pull_user"); run("git fetch $pull_user");
run("git merge --no-ff $pull_user/$pull_branch"); run("git merge --no-ff $pull_user/$pull_branch");
run("phpunit"); run("phpBB/vendor/bin/phpunit");
run("git checkout develop"); run("git checkout develop");
run("git pull $remote develop"); run("git pull $remote develop");
run("git merge --no-ff develop-olympus"); run("git merge --no-ff develop-olympus");
run("phpunit"); run("phpBB/vendor/bin/phpunit");
break; break;
case 'develop': case 'develop':
@ -93,7 +93,7 @@ function work($pull_id, $remote)
add_remote($pull_user, 'phpbb3'); add_remote($pull_user, 'phpbb3');
run("git fetch $pull_user"); run("git fetch $pull_user");
run("git merge --no-ff $pull_user/$pull_branch"); run("git merge --no-ff $pull_user/$pull_branch");
run("phpunit"); run("phpBB/vendor/bin/phpunit");
break; break;
default: default:

4
tests/RUNNING_TESTS.txt
View file

@ -95,7 +95,7 @@ Running
Once the prerequisites are installed, run the tests from the project root Once the prerequisites are installed, run the tests from the project root
directory (above phpBB): directory (above phpBB):
$ phpunit $ phpBB/vendor/bin/phpunit
Slow tests Slow tests
-------------- --------------
@ -105,7 +105,7 @@ Thus these tests are in the `slow` group, which is excluded by default. You can
enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you
only want the slow tests, run: only want the slow tests, run:
$ phpunit --group slow $ phpBB/vendor/bin/phpunit --group slow
More Information More Information
================ ================