diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-09 18:58:31 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-09 19:21:40 +0200 |
| commit | f2f97dd5e06be645f830e0467737d9f23544d631 (patch) | |
| tree | d3806ee36b10d651967d8d0834bf86674736aa35 /git-tools/merge.php | |
| parent | b5b1e88915ae8ae220c62b0d27f514069c3c0249 (diff) | |
| download | forums-f2f97dd5e06be645f830e0467737d9f23544d631.tar forums-f2f97dd5e06be645f830e0467737d9f23544d631.tar.gz forums-f2f97dd5e06be645f830e0467737d9f23544d631.tar.bz2 forums-f2f97dd5e06be645f830e0467737d9f23544d631.tar.xz forums-f2f97dd5e06be645f830e0467737d9f23544d631.zip | |
[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
PHPBB3-11513
Diffstat (limited to 'git-tools/merge.php')
| -rwxr-xr-x | git-tools/merge.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-tools/merge.php b/git-tools/merge.php index 034bd2032c..41a96c0890 100755 --- a/git-tools/merge.php +++ b/git-tools/merge.php @@ -78,12 +78,12 @@ function work($pull_id, $remote) add_remote($pull_user, 'phpbb3'); run("git fetch $pull_user"); run("git merge --no-ff $pull_user/$pull_branch"); - run("phpunit"); + run("phpBB/vendor/bin/phpunit"); run("git checkout develop"); run("git pull $remote develop"); run("git merge --no-ff develop-olympus"); - run("phpunit"); + run("phpBB/vendor/bin/phpunit"); break; case 'develop': @@ -93,7 +93,7 @@ function work($pull_id, $remote) add_remote($pull_user, 'phpbb3'); run("git fetch $pull_user"); run("git merge --no-ff $pull_user/$pull_branch"); - run("phpunit"); + run("phpBB/vendor/bin/phpunit"); break; default: |