diff options
| author | Julien Moumné <julien@piwik.org> | 2013-04-09 02:26:34 +0400 |
|---|---|---|
| committer | Julien Moumné <julien@piwik.org> | 2013-04-09 02:26:34 +0400 |
| commit | 545c9998b75a38739e761b9157e988cf4aab77bd (patch) | |
| tree | 34518fe5ac912ecdc15e234435bcbd528434b8f8 /tests | |
| parent | e0b35c67eb34f8b6e8ed0af0b5a341d74a6d6700 (diff) | |
refs #3323 enable static png images in integration tests for travis-ci
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PHPUnit/BaseFixture.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/BaseFixture.php b/tests/PHPUnit/BaseFixture.php index b0b20e6673..917caf36cb 100644 --- a/tests/PHPUnit/BaseFixture.php +++ b/tests/PHPUnit/BaseFixture.php @@ -263,9 +263,9 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert { $gdInfo = gd_info(); return - (stristr(php_uname(), self::IMAGES_GENERATED_ONLY_FOR_OS)) && + stristr(php_uname(), self::IMAGES_GENERATED_ONLY_FOR_OS) && version_compare(phpversion(), self::IMAGES_GENERATED_FOR_PHP, '>=') && - $gdInfo['GD Version'] == self::IMAGES_GENERATED_FOR_GD; + stristr($gdInfo['GD Version'], self::IMAGES_GENERATED_FOR_GD); } public static $geoIpDbUrl = 'http://piwik-team.s3.amazonaws.com/GeoIP.dat.gz'; |