Commit:    6764993358f2da19896f1c0ca6a114af744125dc
Author:    Michael Wallner <m...@php.net>         Mon, 21 Oct 2013 12:21:21 
+0200
Parents:   454a9fcb14c62384bd223c1d5668701061cf647f 
fb610b4e808c770800434d1a42d606f274927a94
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=6764993358f2da19896f1c0ca6a114af744125dc

Log:
Merge branch 'PHP-5.5'

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

Changed paths:
  MM  ext/standard/tests/file/disk_free_space_basic.phpt


Diff:
diff --cc ext/standard/tests/file/disk_free_space_basic.phpt
index bff30d9,200e92a..2904ff9
--- 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") );


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to