Commit: 47ac4f8670403144f1712a38ffee511b38d6040c Author: Xinchen Hui <larue...@php.net> Fri, 2 Aug 2013 18:43:08 +0800 Parents: 6f1a762fab8dc42b0d2190cb3cbf89da8e0903e5 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=47ac4f8670403144f1712a38ffee511b38d6040c Log: Fixed tests (inet_pton behaves differently on Darwin) Changed paths: M ext/standard/tests/network/ip2long_variation2_x64.phpt Diff: diff --git a/ext/standard/tests/network/ip2long_variation2_x64.phpt b/ext/standard/tests/network/ip2long_variation2_x64.phpt index d4b62fb..a6fde5b 100644 --- a/ext/standard/tests/network/ip2long_variation2_x64.phpt +++ b/ext/standard/tests/network/ip2long_variation2_x64.phpt @@ -1,13 +1,21 @@ --TEST-- Test ip2long() function : usage variation 2, 64 bit --SKIPIF-- -<?php if(PHP_INT_SIZE != 8) {die('skip 64 bit only');} ?> +<?php +/* from man inet_pton : + All numbers supplied as ``parts'' in a `.' notation may be decimal, octal, or hexadecimal, as specified + in the C language (i.e., a leading 0x or 0X implies hexadecimal; otherwise, a leading 0 implies octal; + otherwise, the number is interpreted as decimal). +*/ +if(PHP_OS == 'Darwin') die("skip - inet_pton behaves differently on Darwin"); +if(PHP_INT_SIZE != 8) {die('skip 64 bit only');} +?> --FILE-- <?php /* Prototype : int ip2long(string ip_address) - * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address + * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ $ips = array( -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php