| Index: branches/REL1_18/phase3/tests/phpunit/install-phpunit.sh |
| — | — | @@ -26,7 +26,11 @@ |
| 27 | 27 | else if ( has_binary yum ); then |
| 28 | 28 | echo Installing phpunit with yum |
| 29 | 29 | yum install phpunit |
| | 30 | +else if ( has_binary port ); then |
| | 31 | + echo Installing phpunit with macports |
| | 32 | + port install php5-unit |
| 30 | 33 | fi |
| 31 | 34 | fi |
| 32 | 35 | fi |
| 33 | 36 | fi |
| | 37 | +fi |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/RandomImageGenerator.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 34 | 38 | Merged /trunk/phase3/tests/phpunit/includes/api/RandomImageGenerator.php:r89479-89480 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/ApiUploadTest.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 39 | Merged /trunk/phase3/tests/phpunit/includes/api/ApiUploadTest.php:r89479-89480 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/generateRandomImages.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 36 | 40 | Merged /trunk/phase3/tests/phpunit/includes/api/generateRandomImages.php:r89479-89480 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/Makefile |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 37 | 41 | Merged /trunk/phase3/tests/phpunit/Makefile:r89479-89480 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 38 | 42 | Merged /branches/new-installer/phase3/tests/phpunit:r43664-66004 |
| 39 | 43 | Merged /branches/REL1_15/phase3/tests/phpunit:r51646 |
| 40 | 44 | Merged /branches/REL1_17/phase3/tests/phpunit:r81445,81448 |
| 41 | 45 | Merged /branches/sqlite/tests/phpunit:r58211-58321 |
| 42 | 46 | Merged /trunk/phase3/tests/phpunit:r87632,87636,87640,87644,89479-89480 |