stas Wed, 31 Aug 2011 07:10:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315855
Log:
test fixes on Darwin
Changed paths:
U php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt
U php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt
U php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/math/bug45712.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/nl_langinfo_variation1.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtolower.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtoupper1.phpt
U php/php-src/trunk/ext/date/tests/bug33532.phpt
U php/php-src/trunk/ext/date/tests/gmstrftime_variation22.phpt
U php/php-src/trunk/ext/date/tests/strftime_variation22.phpt
U php/php-src/trunk/ext/standard/tests/math/bug45712.phpt
U php/php-src/trunk/ext/standard/tests/strings/nl_langinfo_variation1.phpt
U php/php-src/trunk/ext/standard/tests/strings/strtolower.phpt
U php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt
Modified: php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -3,6 +3,9 @@
--INI--
error_reporting=2047
date.timezone=UTC
+--SKIPIF--
+<?php
+if(PHP_OS == 'Darwin') die("skip strftime depends on TZ on Darwin");
--FILE--
<?php
@@ -18,6 +21,7 @@
print "\nSetting TZ\n";
date_default_timezone_set('Australia/Sydney');
+putenv("TZ=Australia/Sydney");
$input = "10:00:00 AM July 1 2005";
print "input " . $input . "\n";
$tStamp = strtotime($input);
Modified: php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -5,8 +5,8 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
-if (!setlocale(LC_ALL, "en_US.utf8", "en_US")) {
- die("skip Locale en_US or en_US.utf8 is required to run this test");
+if (!setlocale(LC_TIME, "POSIX")) {
+ die("skip Locale POSIX is required to run this test");
}
?>
--FILE--
@@ -21,7 +21,8 @@
// Initialise function arguments not being substituted (if any)
$timestamp = gmmktime(8, 8, 8, 8, 8, 2008);
-setlocale(LC_ALL, "en_US.utf8", "en_US");
+setlocale(LC_TIME, "POSIX");
+putenv("LC_TIME=POSIX");
date_default_timezone_set("Asia/Calcutta");
//array of values to iterate over
@@ -46,13 +47,13 @@
--Preferred date and time representation--
string(2) "%c"
-string(31) "Fri 08 Aug 2008 08:08:08 AM GMT"
+string(24) "Fri Aug 8 08:08:08 2008"
--Preferred date representation--
string(2) "%x"
-string(10) "08/08/2008"
+string(8) "08/08/08"
--Preferred time representation--
string(2) "%X"
-string(11) "08:08:08 AM"
+string(8) "08:08:08"
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -5,8 +5,8 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
-if(!setlocale(LC_ALL, "en_US.utf8", "en_US")) {
- die("skip Locale en_US.utf8 or en_US is needed by test and is not available");
+if(!setlocale(LC_ALL, "POSIX")) {
+ die("skip Locale POSIX is needed by test and is not available");
}
?>
--FILE--
@@ -20,7 +20,8 @@
echo "*** Testing strftime() : usage variation ***\n";
// Initialise function arguments not being substituted (if any)
-setlocale(LC_ALL, "en_US.utf8", "en_US");
+setlocale(LC_ALL, "POSIX");
+putenv("LC_ALL=POSIX");
date_default_timezone_set("Asia/Calcutta");
$timestamp = mktime(8, 8, 8, 8, 8, 2008);
@@ -46,13 +47,13 @@
--Preferred date and time representation--
string(2) "%c"
-string(31) "Fri 08 Aug 2008 08:08:08 AM IST"
+string(24) "Fri Aug 8 08:08:08 2008"
--Preferred date representation--
string(2) "%x"
-string(10) "08/08/2008"
+string(8) "08/08/08"
--Preferred time representation--
string(2) "%X"
-string(11) "08:08:08 AM"
+string(8) "08:08:08"
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/math/bug45712.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/math/bug45712.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/math/bug45712.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -1,5 +1,7 @@
--TEST--
Bug #45712 (NaN/INF comparison)
+--XFAIL--
+Bug 45712 not fixed yet.
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/nl_langinfo_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/nl_langinfo_variation1.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/nl_langinfo_variation1.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -34,46 +34,22 @@
// array with different values for $input
$items = array (
-
// integer values
-/*1*/ 0,
- 10,
- 2147483647,
+/*1*/ 2147483647,
-2147483648,
+ -20,
- // float values
-/*5*/ 10.5,
- 20.3,
- -20.5,
- 10.1234567e5,
-
- // array values
-/*9*/ array(),
+ // array values
+/*4*/ array(),
array(0),
array(1, 2),
- // boolean values
-/*12*/ true,
- false,
- TRUE,
- FALSE,
-
- // null vlaues
-/*16*/ NULL,
- null,
-
// objects
-/*18*/ new sample(),
+/*7*/ new sample(),
// resource
-/*19*/ $file_handle,
-
- // undefined variable
-/*20*/ @$undefined_var,
-
- // unset variable
-/*21*/ @$unset_var
-);
+/*8*/ $file_handle,
+ );
//defining '$input' argument
$input = "Test string";
@@ -95,86 +71,34 @@
*** Testing nl_langinfo() : with unexpected inputs for 'item' argument ***
-- Iteration 1 --
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
+Warning: nl_langinfo(): Item '2147483647' is not valid in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: nl_langinfo(): Item '10' is not valid in %s on line %d
+Warning: nl_langinfo(): Item '-2147483648' is not valid in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: nl_langinfo(): Item '2147483647' is not valid in %s on line %d
+Warning: nl_langinfo(): Item '-20' is not valid in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: nl_langinfo(): Item '-2147483648' is not valid in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: nl_langinfo(): Item '10' is not valid in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: nl_langinfo(): Item '20' is not valid in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: nl_langinfo(): Item '-20' is not valid in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: nl_langinfo(): Item '1012345' is not valid in %s on line %d
-bool(false)
--- Iteration 9 --
-
Warning: nl_langinfo() expects parameter 1 to be long, array given in %s on line %d
NULL
--- Iteration 10 --
+-- Iteration 5 --
Warning: nl_langinfo() expects parameter 1 to be long, array given in %s on line %d
NULL
--- Iteration 11 --
+-- Iteration 6 --
Warning: nl_langinfo() expects parameter 1 to be long, array given in %s on line %d
NULL
--- Iteration 12 --
+-- Iteration 7 --
-Warning: nl_langinfo(): Item '1' is not valid in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: nl_langinfo(): Item '1' is not valid in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 18 --
-
Warning: nl_langinfo() expects parameter 1 to be long, object given in %s on line %d
NULL
--- Iteration 19 --
+-- Iteration 8 --
Warning: nl_langinfo() expects parameter 1 to be long, resource given in %s on line %d
NULL
--- Iteration 20 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtolower.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtolower.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtolower.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -25,8 +25,8 @@
setlocale(LC_ALL, 'en_US.UTF-8');
}
-echo "*** Testing strtolower() with all 256 chars ***\n";
-for ($i=0; $i<=255; $i++){
+echo "*** Testing strtolower() with 128 chars ***\n";
+for ($i=0; $i<=127; $i++){
$char = chr($i);
print(bin2hex($char))." => ".(bin2hex(strtolower("$char")))."\n";
}
@@ -71,7 +71,7 @@
echo "*** Done ***";
?>
--EXPECTF--
-*** Testing strtolower() with all 256 chars ***
+*** Testing strtolower() with 128 chars ***
00 => 00
01 => 01
02 => 02
@@ -200,134 +200,6 @@
7d => 7d
7e => 7e
7f => 7f
-80 => 80
-81 => 81
-82 => 82
-83 => 83
-84 => 84
-85 => 85
-86 => 86
-87 => 87
-88 => 88
-89 => 89
-8a => 8a
-8b => 8b
-8c => 8c
-8d => 8d
-8e => 8e
-8f => 8f
-90 => 90
-91 => 91
-92 => 92
-93 => 93
-94 => 94
-95 => 95
-96 => 96
-97 => 97
-98 => 98
-99 => 99
-9a => 9a
-9b => 9b
-9c => 9c
-9d => 9d
-9e => 9e
-9f => 9f
-a0 => a0
-a1 => a1
-a2 => a2
-a3 => a3
-a4 => a4
-a5 => a5
-a6 => a6
-a7 => a7
-a8 => a8
-a9 => a9
-aa => aa
-ab => ab
-ac => ac
-ad => ad
-ae => ae
-af => af
-b0 => b0
-b1 => b1
-b2 => b2
-b3 => b3
-b4 => b4
-b5 => b5
-b6 => b6
-b7 => b7
-b8 => b8
-b9 => b9
-ba => ba
-bb => bb
-bc => bc
-bd => bd
-be => be
-bf => bf
-c0 => c0
-c1 => c1
-c2 => c2
-c3 => c3
-c4 => c4
-c5 => c5
-c6 => c6
-c7 => c7
-c8 => c8
-c9 => c9
-ca => ca
-cb => cb
-cc => cc
-cd => cd
-ce => ce
-cf => cf
-d0 => d0
-d1 => d1
-d2 => d2
-d3 => d3
-d4 => d4
-d5 => d5
-d6 => d6
-d7 => d7
-d8 => d8
-d9 => d9
-da => da
-db => db
-dc => dc
-dd => dd
-de => de
-df => df
-e0 => e0
-e1 => e1
-e2 => e2
-e3 => e3
-e4 => e4
-e5 => e5
-e6 => e6
-e7 => e7
-e8 => e8
-e9 => e9
-ea => ea
-eb => eb
-ec => ec
-ed => ed
-ee => ee
-ef => ef
-f0 => f0
-f1 => f1
-f2 => f2
-f3 => f3
-f4 => f4
-f5 => f5
-f6 => f6
-f7 => f7
-f8 => f8
-f9 => f9
-fa => fa
-fb => fb
-fc => fc
-fd => fd
-fe => fe
-ff => ff
*** Testing strlower() with basic strings ***
string(43) "mary had a little lamb and she loved it so
"
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtoupper1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtoupper1.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtoupper1.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -25,8 +25,8 @@
setlocale(LC_ALL, 'en_US.UTF-8');
}
-echo "*** Testing strtoupper() with all 256 chars ***\n";
-for ($i=0; $i<=255; $i++){
+echo "*** Testing strtoupper() with 128 chars ***\n";
+for ($i=0; $i<=127; $i++){
$char = chr($i);
print(bin2hex($char))." => ".(bin2hex(strtoupper("$char")))."\n";
}
@@ -71,7 +71,7 @@
echo "*** Done ***";
?>
--EXPECTF--
-*** Testing strtoupper() with all 256 chars ***
+*** Testing strtoupper() with 128 chars ***
00 => 00
01 => 01
02 => 02
@@ -200,134 +200,6 @@
7d => 7d
7e => 7e
7f => 7f
-80 => 80
-81 => 81
-82 => 82
-83 => 83
-84 => 84
-85 => 85
-86 => 86
-87 => 87
-88 => 88
-89 => 89
-8a => 8a
-8b => 8b
-8c => 8c
-8d => 8d
-8e => 8e
-8f => 8f
-90 => 90
-91 => 91
-92 => 92
-93 => 93
-94 => 94
-95 => 95
-96 => 96
-97 => 97
-98 => 98
-99 => 99
-9a => 9a
-9b => 9b
-9c => 9c
-9d => 9d
-9e => 9e
-9f => 9f
-a0 => a0
-a1 => a1
-a2 => a2
-a3 => a3
-a4 => a4
-a5 => a5
-a6 => a6
-a7 => a7
-a8 => a8
-a9 => a9
-aa => aa
-ab => ab
-ac => ac
-ad => ad
-ae => ae
-af => af
-b0 => b0
-b1 => b1
-b2 => b2
-b3 => b3
-b4 => b4
-b5 => b5
-b6 => b6
-b7 => b7
-b8 => b8
-b9 => b9
-ba => ba
-bb => bb
-bc => bc
-bd => bd
-be => be
-bf => bf
-c0 => c0
-c1 => c1
-c2 => c2
-c3 => c3
-c4 => c4
-c5 => c5
-c6 => c6
-c7 => c7
-c8 => c8
-c9 => c9
-ca => ca
-cb => cb
-cc => cc
-cd => cd
-ce => ce
-cf => cf
-d0 => d0
-d1 => d1
-d2 => d2
-d3 => d3
-d4 => d4
-d5 => d5
-d6 => d6
-d7 => d7
-d8 => d8
-d9 => d9
-da => da
-db => db
-dc => dc
-dd => dd
-de => de
-df => df
-e0 => e0
-e1 => e1
-e2 => e2
-e3 => e3
-e4 => e4
-e5 => e5
-e6 => e6
-e7 => e7
-e8 => e8
-e9 => e9
-ea => ea
-eb => eb
-ec => ec
-ed => ed
-ee => ee
-ef => ef
-f0 => f0
-f1 => f1
-f2 => f2
-f3 => f3
-f4 => f4
-f5 => f5
-f6 => f6
-f7 => f7
-f8 => f8
-f9 => f9
-fa => fa
-fb => fb
-fc => fc
-fd => fd
-fe => fe
-ff => ff
*** Testing strtoupper() with basic strings ***
string(43) "MARY HAD A LITTLE LAMB AND SHE LOVED IT SO
Modified: php/php-src/trunk/ext/date/tests/bug33532.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/bug33532.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/trunk/ext/date/tests/bug33532.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -3,6 +3,9 @@
--INI--
error_reporting=2047
date.timezone=UTC
+--SKIPIF--
+<?php
+if(PHP_OS == 'Darwin') die("skip strftime depends on TZ on Darwin");
--FILE--
<?php
@@ -18,6 +21,7 @@
print "\nSetting TZ\n";
date_default_timezone_set('Australia/Sydney');
+putenv("TZ=Australia/Sydney");
$input = "10:00:00 AM July 1 2005";
print "input " . $input . "\n";
$tStamp = strtotime($input);
Modified: php/php-src/trunk/ext/date/tests/gmstrftime_variation22.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/gmstrftime_variation22.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/trunk/ext/date/tests/gmstrftime_variation22.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -5,8 +5,8 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
-if (!setlocale(LC_ALL, "en_US.utf8", "en_US")) {
- die("skip Locale en_US or en_US.utf8 is required to run this test");
+if (!setlocale(LC_TIME, "POSIX")) {
+ die("skip Locale POSIX is required to run this test");
}
?>
--FILE--
@@ -21,7 +21,8 @@
// Initialise function arguments not being substituted (if any)
$timestamp = gmmktime(8, 8, 8, 8, 8, 2008);
-setlocale(LC_ALL, "en_US.utf8", "en_US");
+setlocale(LC_TIME, "POSIX");
+putenv("LC_TIME=POSIX");
date_default_timezone_set("Asia/Calcutta");
//array of values to iterate over
@@ -46,13 +47,13 @@
--Preferred date and time representation--
string(2) "%c"
-string(31) "Fri 08 Aug 2008 08:08:08 AM GMT"
+string(24) "Fri Aug 8 08:08:08 2008"
--Preferred date representation--
string(2) "%x"
-string(10) "08/08/2008"
+string(8) "08/08/08"
--Preferred time representation--
string(2) "%X"
-string(11) "08:08:08 AM"
+string(8) "08:08:08"
===DONE===
Modified: php/php-src/trunk/ext/date/tests/strftime_variation22.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/strftime_variation22.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/trunk/ext/date/tests/strftime_variation22.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -5,8 +5,8 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
-if(!setlocale(LC_ALL, "en_US.utf8", "en_US")) {
- die("skip Locale en_US.utf8 or en_US is needed by test and is not available");
+if(!setlocale(LC_ALL, "POSIX")) {
+ die("skip Locale POSIX is needed by test and is not available");
}
?>
--FILE--
@@ -20,7 +20,8 @@
echo "*** Testing strftime() : usage variation ***\n";
// Initialise function arguments not being substituted (if any)
-setlocale(LC_ALL, "en_US.utf8", "en_US");
+setlocale(LC_ALL, "POSIX");
+putenv("LC_ALL=POSIX");
date_default_timezone_set("Asia/Calcutta");
$timestamp = mktime(8, 8, 8, 8, 8, 2008);
@@ -46,13 +47,13 @@
--Preferred date and time representation--
string(2) "%c"
-string(31) "Fri 08 Aug 2008 08:08:08 AM IST"
+string(24) "Fri Aug 8 08:08:08 2008"
--Preferred date representation--
string(2) "%x"
-string(10) "08/08/2008"
+string(8) "08/08/08"
--Preferred time representation--
string(2) "%X"
-string(11) "08:08:08 AM"
+string(8) "08:08:08"
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/math/bug45712.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/math/bug45712.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/trunk/ext/standard/tests/math/bug45712.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -1,5 +1,7 @@
--TEST--
Bug #45712 (NaN/INF comparison)
+--XFAIL--
+Bug 45712 not fixed yet.
--FILE--
<?php
Modified: php/php-src/trunk/ext/standard/tests/strings/nl_langinfo_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/nl_langinfo_variation1.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/trunk/ext/standard/tests/strings/nl_langinfo_variation1.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -34,46 +34,22 @@
// array with different values for $input
$items = array (
-
// integer values
-/*1*/ 0,
- 10,
- 2147483647,
+/*1*/ 2147483647,
-2147483648,
+ -20,
- // float values
-/*5*/ 10.5,
- 20.3,
- -20.5,
- 10.1234567e5,
-
- // array values
-/*9*/ array(),
+ // array values
+/*4*/ array(),
array(0),
array(1, 2),
- // boolean values
-/*12*/ true,
- false,
- TRUE,
- FALSE,
-
- // null vlaues
-/*16*/ NULL,
- null,
-
// objects
-/*18*/ new sample(),
+/*7*/ new sample(),
// resource
-/*19*/ $file_handle,
-
- // undefined variable
-/*20*/ @$undefined_var,
-
- // unset variable
-/*21*/ @$unset_var
-);
+/*8*/ $file_handle,
+ );
//defining '$input' argument
$input = "Test string";
@@ -95,86 +71,34 @@
*** Testing nl_langinfo() : with unexpected inputs for 'item' argument ***
-- Iteration 1 --
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
+Warning: nl_langinfo(): Item '2147483647' is not valid in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: nl_langinfo(): Item '10' is not valid in %s on line %d
+Warning: nl_langinfo(): Item '-2147483648' is not valid in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: nl_langinfo(): Item '2147483647' is not valid in %s on line %d
+Warning: nl_langinfo(): Item '-20' is not valid in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: nl_langinfo(): Item '-2147483648' is not valid in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: nl_langinfo(): Item '10' is not valid in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: nl_langinfo(): Item '20' is not valid in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: nl_langinfo(): Item '-20' is not valid in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: nl_langinfo(): Item '1012345' is not valid in %s on line %d
-bool(false)
--- Iteration 9 --
-
Warning: nl_langinfo() expects parameter 1 to be long, array given in %s on line %d
NULL
--- Iteration 10 --
+-- Iteration 5 --
Warning: nl_langinfo() expects parameter 1 to be long, array given in %s on line %d
NULL
--- Iteration 11 --
+-- Iteration 6 --
Warning: nl_langinfo() expects parameter 1 to be long, array given in %s on line %d
NULL
--- Iteration 12 --
+-- Iteration 7 --
-Warning: nl_langinfo(): Item '1' is not valid in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: nl_langinfo(): Item '1' is not valid in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 18 --
-
Warning: nl_langinfo() expects parameter 1 to be long, object given in %s on line %d
NULL
--- Iteration 19 --
+-- Iteration 8 --
Warning: nl_langinfo() expects parameter 1 to be long, resource given in %s on line %d
NULL
--- Iteration 20 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: nl_langinfo(): Item '0' is not valid in %s on line %d
-bool(false)
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/strings/strtolower.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/strtolower.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/trunk/ext/standard/tests/strings/strtolower.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -25,8 +25,8 @@
setlocale(LC_ALL, 'en_US.UTF-8');
}
-echo "*** Testing strtolower() with all 256 chars ***\n";
-for ($i=0; $i<=255; $i++){
+echo "*** Testing strtolower() with 128 chars ***\n";
+for ($i=0; $i<=127; $i++){
$char = chr($i);
print(bin2hex($char))." => ".(bin2hex(strtolower("$char")))."\n";
}
@@ -71,7 +71,7 @@
echo "*** Done ***";
?>
--EXPECTF--
-*** Testing strtolower() with all 256 chars ***
+*** Testing strtolower() with 128 chars ***
00 => 00
01 => 01
02 => 02
@@ -200,134 +200,6 @@
7d => 7d
7e => 7e
7f => 7f
-80 => 80
-81 => 81
-82 => 82
-83 => 83
-84 => 84
-85 => 85
-86 => 86
-87 => 87
-88 => 88
-89 => 89
-8a => 8a
-8b => 8b
-8c => 8c
-8d => 8d
-8e => 8e
-8f => 8f
-90 => 90
-91 => 91
-92 => 92
-93 => 93
-94 => 94
-95 => 95
-96 => 96
-97 => 97
-98 => 98
-99 => 99
-9a => 9a
-9b => 9b
-9c => 9c
-9d => 9d
-9e => 9e
-9f => 9f
-a0 => a0
-a1 => a1
-a2 => a2
-a3 => a3
-a4 => a4
-a5 => a5
-a6 => a6
-a7 => a7
-a8 => a8
-a9 => a9
-aa => aa
-ab => ab
-ac => ac
-ad => ad
-ae => ae
-af => af
-b0 => b0
-b1 => b1
-b2 => b2
-b3 => b3
-b4 => b4
-b5 => b5
-b6 => b6
-b7 => b7
-b8 => b8
-b9 => b9
-ba => ba
-bb => bb
-bc => bc
-bd => bd
-be => be
-bf => bf
-c0 => c0
-c1 => c1
-c2 => c2
-c3 => c3
-c4 => c4
-c5 => c5
-c6 => c6
-c7 => c7
-c8 => c8
-c9 => c9
-ca => ca
-cb => cb
-cc => cc
-cd => cd
-ce => ce
-cf => cf
-d0 => d0
-d1 => d1
-d2 => d2
-d3 => d3
-d4 => d4
-d5 => d5
-d6 => d6
-d7 => d7
-d8 => d8
-d9 => d9
-da => da
-db => db
-dc => dc
-dd => dd
-de => de
-df => df
-e0 => e0
-e1 => e1
-e2 => e2
-e3 => e3
-e4 => e4
-e5 => e5
-e6 => e6
-e7 => e7
-e8 => e8
-e9 => e9
-ea => ea
-eb => eb
-ec => ec
-ed => ed
-ee => ee
-ef => ef
-f0 => f0
-f1 => f1
-f2 => f2
-f3 => f3
-f4 => f4
-f5 => f5
-f6 => f6
-f7 => f7
-f8 => f8
-f9 => f9
-fa => fa
-fb => fb
-fc => fc
-fd => fd
-fe => fe
-ff => ff
*** Testing strlower() with basic strings ***
string(43) "mary had a little lamb and she loved it so
"
Modified: php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt 2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt 2011-08-31 07:10:17 UTC (rev 315855)
@@ -25,8 +25,8 @@
setlocale(LC_ALL, 'en_US.UTF-8');
}
-echo "*** Testing strtoupper() with all 256 chars ***\n";
-for ($i=0; $i<=255; $i++){
+echo "*** Testing strtoupper() with 128 chars ***\n";
+for ($i=0; $i<=127; $i++){
$char = chr($i);
print(bin2hex($char))." => ".(bin2hex(strtoupper("$char")))."\n";
}
@@ -71,7 +71,7 @@
echo "*** Done ***";
?>
--EXPECTF--
-*** Testing strtoupper() with all 256 chars ***
+*** Testing strtoupper() with 128 chars ***
00 => 00
01 => 01
02 => 02
@@ -200,134 +200,6 @@
7d => 7d
7e => 7e
7f => 7f
-80 => 80
-81 => 81
-82 => 82
-83 => 83
-84 => 84
-85 => 85
-86 => 86
-87 => 87
-88 => 88
-89 => 89
-8a => 8a
-8b => 8b
-8c => 8c
-8d => 8d
-8e => 8e
-8f => 8f
-90 => 90
-91 => 91
-92 => 92
-93 => 93
-94 => 94
-95 => 95
-96 => 96
-97 => 97
-98 => 98
-99 => 99
-9a => 9a
-9b => 9b
-9c => 9c
-9d => 9d
-9e => 9e
-9f => 9f
-a0 => a0
-a1 => a1
-a2 => a2
-a3 => a3
-a4 => a4
-a5 => a5
-a6 => a6
-a7 => a7
-a8 => a8
-a9 => a9
-aa => aa
-ab => ab
-ac => ac
-ad => ad
-ae => ae
-af => af
-b0 => b0
-b1 => b1
-b2 => b2
-b3 => b3
-b4 => b4
-b5 => b5
-b6 => b6
-b7 => b7
-b8 => b8
-b9 => b9
-ba => ba
-bb => bb
-bc => bc
-bd => bd
-be => be
-bf => bf
-c0 => c0
-c1 => c1
-c2 => c2
-c3 => c3
-c4 => c4
-c5 => c5
-c6 => c6
-c7 => c7
-c8 => c8
-c9 => c9
-ca => ca
-cb => cb
-cc => cc
-cd => cd
-ce => ce
-cf => cf
-d0 => d0
-d1 => d1
-d2 => d2
-d3 => d3
-d4 => d4
-d5 => d5
-d6 => d6
-d7 => d7
-d8 => d8
-d9 => d9
-da => da
-db => db
-dc => dc
-dd => dd
-de => de
-df => df
-e0 => e0
-e1 => e1
-e2 => e2
-e3 => e3
-e4 => e4
-e5 => e5
-e6 => e6
-e7 => e7
-e8 => e8
-e9 => e9
-ea => ea
-eb => eb
-ec => ec
-ed => ed
-ee => ee
-ef => ef
-f0 => f0
-f1 => f1
-f2 => f2
-f3 => f3
-f4 => f4
-f5 => f5
-f6 => f6
-f7 => f7
-f8 => f8
-f9 => f9
-fa => fa
-fb => fb
-fc => fc
-fd => fd
-fe => fe
-ff => ff
*** Testing strtoupper() with basic strings ***
string(43) "MARY HAD A LITTLE LAMB AND SHE LOVED IT SO
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
