From 55d521eecdf1bfd021173d858f02def869b032fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 2 Apr 2014 11:28:27 +0200 Subject: [PATCH 1/2] Remove debugging code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f362a0e003..35d6b2b353 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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,8 +43,6 @@ before_script: if [[ ! -z "$SELENIUM" ]] ; then - find ~/.phpenv ; - 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 ; From 2ef07440f660cb8d42796c0593dbac2b71dfa8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 2 Apr 2014 11:32:16 +0200 Subject: [PATCH 2/2] Install wrappers compatible with installed phpunit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35d6b2b353..397343c491 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,10 @@ before_script: if [[ ! -z "$SELENIUM" ]] ; then - ln -s ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php . ; + ln -s ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit/phpunit/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 ;