From: Michael Wallner <mike@php.net>
Date: Mon, 21 Oct 2013 10:21:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~227^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6764993358f2da19896f1c0ca6a114af744125dc;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis
---

6764993358f2da19896f1c0ca6a114af744125dc
diff --cc ext/standard/tests/file/disk_free_space_basic.phpt
index bff30d9043,200e92ab43..2904ff9a5b
--- a/ext/standard/tests/file/disk_free_space_basic.phpt
+++ b/ext/standard/tests/file/disk_free_space_basic.phpt
@@@ -33,12 -37,10 +37,12 @@@ echo "\n Free Space after writing to a 
  $space2 =  disk_free_space($file_path.$dir); 
  var_dump( $space2 ); 
  
- if(getenv('TRAVIS') === 'true' || $space1 > $space2 )
+ if($space1 > $space2 )
    echo "\n Free Space Value Is Correct\n";
 -else
 +else {
    echo "\n Free Space Value Is Incorrect\n";
 +  var_dump($space1, $space2);
 +}
  
  echo "*** Testing with Binary Input ***\n";
  var_dump( disk_free_space(b"$file_path") );