diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-05-09 10:30:20 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-05-09 10:30:20 -0700 |
| commit | 3fb536d7b7a51409a87192b2309ccf50ab11564f (patch) | |
| tree | 5984921bf10f9424e2c2f8d12d753f4960ff86b5 /git-tools | |
| parent | 4e3c5aefa83cac5e128f892915b222d9bd41ee72 (diff) | |
| parent | c31123e8a4f3350cd33be80a8178a0c94617d9c7 (diff) | |
| download | forums-3fb536d7b7a51409a87192b2309ccf50ab11564f.tar forums-3fb536d7b7a51409a87192b2309ccf50ab11564f.tar.gz forums-3fb536d7b7a51409a87192b2309ccf50ab11564f.tar.bz2 forums-3fb536d7b7a51409a87192b2309ccf50ab11564f.tar.xz forums-3fb536d7b7a51409a87192b2309ccf50ab11564f.zip | |
Merge pull request #1387 from bantu/ticket/11513
[ticket/11513] Install PHPUnit via Composer
Diffstat (limited to 'git-tools')
| -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: |