diff options
author | Brian Shire <shire@php.net> | 2007-06-04 01:23:07 +0000 |
---|---|---|
committer | Brian Shire <shire@php.net> | 2007-06-04 01:23:07 +0000 |
commit | 55b5b89ef705b902356049c16560f5855b32dbf5 (patch) | |
tree | fe1431c82e8d5ef5e6589d3a91c718f41e88cabe /ext | |
parent | d1b9c6e62eb767247550f350f3b84ed2c242808d (diff) | |
download | php-git-55b5b89ef705b902356049c16560f5855b32dbf5.tar.gz |
fix sprintf/printf %u tests so they work correctly on both 32-bit and 64-bit. (broken in previous fix)
# just made these EXPECTREGEX expressions, if there's a prefered way to comply with both 32/64 bit let me know.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/standard/tests/array/bug35014_64bit.phpt | 4 | ||||
-rw-r--r-- | ext/standard/tests/strings/bug23894.phpt | 10 | ||||
-rw-r--r-- | ext/standard/tests/strings/bug26973.phpt | 20 | ||||
-rwxr-xr-x | ext/standard/tests/strings/printf_64bit.phpt | 6 | ||||
-rwxr-xr-x | ext/standard/tests/strings/sprintf_f_2.phpt | 68 |
5 files changed, 54 insertions, 54 deletions
diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt index a5b8da8a3c..ae9dc3160e 100644 --- a/ext/standard/tests/array/bug35014_64bit.phpt +++ b/ext/standard/tests/array/bug35014_64bit.phpt @@ -32,5 +32,5 @@ int(3) int(9) float(1) int(9999999800000001) -float(2.8404260053903E+20) -int(8589934590) +float(1.219953680145E+30) +float(3.6893488147419E+19) diff --git a/ext/standard/tests/strings/bug23894.phpt b/ext/standard/tests/strings/bug23894.phpt index 9cc0316a24..3455081f11 100644 --- a/ext/standard/tests/strings/bug23894.phpt +++ b/ext/standard/tests/strings/bug23894.phpt @@ -8,8 +8,8 @@ var_dump($test, bin2hex($test)); $test = sprintf("% 13u", $a); var_dump($test, bin2hex($test)); ?> ---EXPECT-- -string(4) "-012" -string(8) "2d303132" -string(13) " 4294967284" -string(26) "20202034323934393637323834" +--EXPECTREGEX-- +string\(4\) \"-012\" +string\(8\) \"2d303132\" +(string\(13\) \" 4294967284\"|string\(20\) \"18446744073709551604\") +(string\(26\) \"20202034323934393637323834\"|string\(40\) \"3138343436373434303733373039353531363034\") diff --git a/ext/standard/tests/strings/bug26973.phpt b/ext/standard/tests/strings/bug26973.phpt index 4a586ecaa2..9de3be4929 100644 --- a/ext/standard/tests/strings/bug26973.phpt +++ b/ext/standard/tests/strings/bug26973.phpt @@ -18,17 +18,17 @@ printf("%05u\n", 200); printf("%05u\n", -200); ?> ---EXPECT-- -+0200 --0200 -+200.000000 --200.000000 +--EXPECTREGEX-- +\+0200 +\-0200 +\+200\.000000 +\-200\.000000 00200 -4294967096 +(4294967096|18446744073709551416) --- 00200 --0200 -200.000000 --200.000000 +\-0200 +200\.000000 +\-200\.000000 00200 -4294967096 +(4294967096|18446744073709551416) diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt index 9d78d0c7a4..10ea360c04 100755 --- a/ext/standard/tests/strings/printf_64bit.phpt +++ b/ext/standard/tests/strings/printf_64bit.phpt @@ -531,11 +531,11 @@ Array 0 1 -4294967295 +18446744073709551615 2 -4294967294 +18446744073709551614 23333333 -4271633963 +18446744073686218283 1234 *** Output for octal type *** diff --git a/ext/standard/tests/strings/sprintf_f_2.phpt b/ext/standard/tests/strings/sprintf_f_2.phpt index a4b71bc462..1c7cc7f924 100755 --- a/ext/standard/tests/strings/sprintf_f_2.phpt +++ b/ext/standard/tests/strings/sprintf_f_2.phpt @@ -80,37 +80,37 @@ $number = 362525200; var_dump(sprintf("%.3e", $number)); // outputs 3.63e+8 ?> ---EXPECT-- -string(7) "100.426" -string(6) "100.43" -string(3) "100" -string(3) "100" -string(3) "144" -string(3) "144" -string(34) "There are 100 monkeys in the world" -string(28) "The 100.1 contains 0 monkeys" -string(30) "The world contains 100 monkeys" -string(76) "The world contains 100 monkeys. - That's a nice world full of 100 monkeys." -string(33) "%b = '10100111101010011010101101'" -string(8) "%c = 'A'" -string(15) "%d = '43951789'" -string(18) "%e = '4.395179e+7'" -string(15) "%u = '43951789'" -string(17) "%u = '4251015507'" -string(22) "%f = '43951789.000000'" -string(16) "%o = '247523255'" -string(15) "%s = '43951789'" -string(14) "%x = '29ea6ad'" -string(14) "%X = '29EA6AD'" -string(17) "%+d = '+43951789'" -string(17) "%+d = '-43951789'" -string(8) "[monkey]" -string(12) "[ monkey]" -string(12) "[monkey ]" -string(12) "[0000monkey]" -string(12) "[####monkey]" -string(12) "[many monke]" -string(10) "2006-12-18" -string(6) "123.10" -string(8) "3.625e+8" +--EXPECTREGEX-- +string\(7\) \"100\.426\" +string\(6\) \"100\.43\" +string\(3\) \"100\" +string\(3\) \"100\" +string\(3\) \"144\" +string\(3\) \"144\" +string\(34\) \"There are 100 monkeys in the world\" +string\(28\) \"The 100\.1 contains 0 monkeys\" +string\(30\) \"The world contains 100 monkeys\" +string\(76\) \"The world contains 100 monkeys. + That's a nice world full of 100 monkeys\.\" +string\(33\) \"%b = '10100111101010011010101101'\" +string\(8\) \"%c = 'A'\" +string\(15\) \"%d = '43951789'\" +string\(18\) \"%e = '4\.395179e\+7'\" +string\(15\) \"%u = '43951789'\" +(string\(17\) \"%u = '4251015507'\"|string\(27\) \"%u = '18446744073665599827'\") +string\(22\) \"%f = '43951789\.000000'\" +string\(16\) \"%o = '247523255'\" +string\(15\) \"%s = '43951789'\" +string\(14\) \"%x = '29ea6ad'\" +string\(14\) \"%X = '29EA6AD'\" +string\(17\) \"%\+d = '\+43951789'\" +string\(17\) \"%\+d = '-43951789'\" +string\(8\) \"\[monkey\]\" +string\(12\) \"\[ monkey\]\" +string\(12\) \"\[monkey \]\" +string\(12\) \"\[0000monkey\]\" +string\(12\) \"\[####monkey\]\" +string\(12\) \"\[many monke\]\" +string\(10\) \"2006-12-18\" +string\(6\) \"123\.10\" +string\(8\) \"3\.625e\+8\" |