Merge remote-tracking branch 'refs/remotes/pma/master'

This commit is contained in:
Ann + J.M 2014-04-02 11:34:09 +02:00
commit 4ebadff98e

View File

@ -35,7 +35,7 @@ before_script:
phpenv config-add test/travis.php.ini ;
pear channel-discover pear.phpunit.de ;
pear -v install phpunit/PHPUnit_Selenium ;
pear install phpunit/PHPUnit_Selenium ;
composer install --dev --no-interaction ;
@ -43,12 +43,10 @@ before_script:
if [[ ! -z "$SELENIUM" ]] ; then
find ~/.phpenv ;
ln -s ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit/phpunit/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php . ;
ln -s ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php . ;
echo auto_prepend_file = ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/prepend.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
echo auto_append_file = ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/append.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
echo auto_prepend_file = ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit/phpunit/PHPUnit/Extensions/SeleniumCommon/prepend.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
echo auto_append_file = ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit/phpunit/PHPUnit/Extensions/SeleniumCommon/append.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
php --server 127.0.0.1:8000 &
wget http://www.browserstack.com/BrowserStackTunnel.jar ;