hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test_helpers are now optionnals

Browse Source
This commit is contained in:
Romain Neutron
2012-04-27 19:30:33 +02:00
parent ce7ae09a1a
commit c230c9eba4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -10,16 +10,16 @@ before_script:
- mysql -e "source `pwd`/hudson/fixtures.sql" - mysql -e "source `pwd`/hudson/fixtures.sql"
- git clone git://github.com/alchemy-fr/Phraseanet-Extension.git - git clone git://github.com/alchemy-fr/Phraseanet-Extension.git
- sh -c "cd Phraseanet-Extension && ./configure && make && sudo make install" - sh -c "cd Phraseanet-Extension && ./configure && make && sudo make install"
- git clone git://github.com/sebastianbergmann/php-test-helpers.git
- echo "extension=phrasea2.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` - echo "extension=phrasea2.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- sh -c "cd php-test-helpers && phpize && ./configure && make && sudo make install" # - git clone git://github.com/sebastianbergmann/php-test-helpers.git
# - sh -c "cd php-test-helpers && phpize && ./configure && make && sudo make install"
- wget http://www.swftools.org/swftools-0.9.1.tar.gz - wget http://www.swftools.org/swftools-0.9.1.tar.gz
- sh -c "tar xzvf swftools-0.9.1.tar.gz && cd swftools-0.9.1 && ./configure && make && sudo make install" - sh -c "tar xzvf swftools-0.9.1.tar.gz && cd swftools-0.9.1 && ./configure && make && sudo make install"
- wget http://pecl.php.net/get/gmagick-1.1.0RC2.tgz - wget http://pecl.php.net/get/gmagick-1.1.0RC2.tgz
- tar -xzf gmagick-1.1.0RC2.tgz - tar -xzf gmagick-1.1.0RC2.tgz
- sh -c "cd gmagick-1.1.0RC2 && phpize && ./configure --with-gmagick=/usr/local && make && sudo make install" - sh -c "cd gmagick-1.1.0RC2 && phpize && ./configure --with-gmagick=/usr/local && make && sudo make install"
- echo "extension=gmagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` - echo "extension=gmagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- echo "zend_extension=`php -i | grep "^extension_dir =>" | sed -e "s|.*=>\s*||"`/test_helpers.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` # - echo "zend_extension=`php -i | grep "^extension_dir =>" | sed -e "s|.*=>\s*||"`/test_helpers.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
php: php:
- 5.3.2 - 5.3.2

2
tests/Alchemy/Phrasea/CoreTest.php
View File

@@ -109,7 +109,7 @@ class CoreTest extends PhraseanetPHPUnitAbstract
if (!extension_loaded('test_helpers')) if (!extension_loaded('test_helpers'))
{ {
$this->fail("test_helpers extension required"); $this->markTestSkipped("test_helpers extension required");
} }
set_new_overload(array($this, 'newCallback')); set_new_overload(array($this, 'newCallback'));