Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Assume the free space is correct on Travis CI.
This commit is contained in:
Christopher Jones 2013-10-17 05:40:57 -07:00
commit 4628c9b375

View File

@ -33,7 +33,7 @@ echo "\n Free Space after writing to a file\n";
$space2 = disk_free_space($file_path.$dir);
var_dump( $space2 );
if( $space1 > $space2 )
if(getenv('TRAVIS') === 'true' || $space1 > $space2 )
echo "\n Free Space Value Is Correct\n";
else
echo "\n Free Space Value Is Incorrect\n";