bjori Sun, 05 Jun 2011 09:35:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311825
Log:
Fix tests when running without mbstring
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt
U php/php-src/branches/PHP_5_4/Zend/tests/declare_002.phpt
A php/php-src/branches/PHP_5_4/Zend/tests/declare_003.phpt
A php/php-src/branches/PHP_5_4/Zend/tests/declare_004.phpt
U php/php-src/trunk/Zend/tests/declare_001.phpt
U php/php-src/trunk/Zend/tests/declare_002.phpt
A php/php-src/trunk/Zend/tests/declare_003.phpt
A php/php-src/trunk/Zend/tests/declare_004.phpt
Modified: php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt 2011-06-05
08:59:24 UTC (rev 311824)
+++ php/php-src/branches/PHP_5_4/Zend/tests/declare_001.phpt 2011-06-05
09:35:49 UTC (rev 311825)
@@ -1,5 +1,11 @@
--TEST--
Testing declare statement with several type values
+--SKIPIF--
+<?php
+if (!extension_loaded("mbstring")) {
+ die("skip Requires ext/mbstring");
+}
+?>
--INI--
zend.multibyte=1
--FILE--
@@ -17,8 +23,8 @@
--EXPECTF--
Warning: Unsupported encoding [1] in %sdeclare_001.php on line %d
-Warning: Unsupported encoding [1.1231312321313E+18] in %sdeclare_001.php on
line %d
+Warning: Unsupported encoding [1123131232131312321] in %sdeclare_001.php on
line %d
Warning: Unsupported encoding [] in %sdeclare_001.php on line %d
-Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d
\ No newline at end of file
+Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d
Modified: php/php-src/branches/PHP_5_4/Zend/tests/declare_002.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/tests/declare_002.phpt 2011-06-05
08:59:24 UTC (rev 311824)
+++ php/php-src/branches/PHP_5_4/Zend/tests/declare_002.phpt 2011-06-05
09:35:49 UTC (rev 311825)
@@ -5,6 +5,9 @@
if (!ini_get("zend.multibyte")) {
die("skip Requires zend.multibyte=1");
}
+if (!extension_loaded("mbstring")) {
+ die("skip Requires ext/mbstring");
+}
?>
--FILE--
<?php
Added: php/php-src/branches/PHP_5_4/Zend/tests/declare_003.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/tests/declare_003.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/declare_003.phpt 2011-06-05
09:35:49 UTC (rev 311825)
@@ -0,0 +1,23 @@
+--TEST--
+Testing declare statement with several type values
+--INI--
+zend.multibyte=1
+--FILE--
+<?php
+
+declare(encoding = 1);
+declare(encoding = 1123131232131312321);
+declare(encoding = NULL);
+declare(encoding = M_PI);
+
+print 'DONE';
+
+?>
+--EXPECTF--
+Warning: Unsupported encoding [1] in %sdeclare_003.php on line %d
+
+Warning: Unsupported encoding [1123131232131312321] in %sdeclare_003.php on
line %d
+
+Warning: Unsupported encoding [] in %sdeclare_003.php on line %d
+
+Fatal error: Cannot use constants as encoding in %sdeclare_003.php on line %d
Added: php/php-src/branches/PHP_5_4/Zend/tests/declare_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/tests/declare_004.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/declare_004.phpt 2011-06-05
09:35:49 UTC (rev 311825)
@@ -0,0 +1,27 @@
+--TEST--
+Testing declare statement with several type values
+--SKIPIF--
+<?php
+if (!ini_get("zend.multibyte")) {
+ die("skip Requires zend.multibyte=1");
+}
+?>
+--FILE--
+<?php
+
+declare(encoding = 1);
+declare(encoding = 1123131232131312321);
+declare(encoding = NULL);
+declare(encoding = M_PI);
+
+print 'DONE';
+
+?>
+--EXPECTF--
+Warning: Unsupported encoding [%d] in %sdeclare_004.php on line 3
+
+Warning: Unsupported encoding [%f] in %sdeclare_004.php on line 4
+
+Warning: Unsupported encoding [] in %sdeclare_004.php on line 5
+
+Fatal error: Cannot use constants as encoding in %sdeclare_004.php on line 6
Modified: php/php-src/trunk/Zend/tests/declare_001.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/declare_001.phpt 2011-06-05 08:59:24 UTC
(rev 311824)
+++ php/php-src/trunk/Zend/tests/declare_001.phpt 2011-06-05 09:35:49 UTC
(rev 311825)
@@ -1,5 +1,11 @@
--TEST--
Testing declare statement with several type values
+--SKIPIF--
+<?php
+if (!extension_loaded("mbstring")) {
+ die("skip Requires ext/mbstring");
+}
+?>
--INI--
zend.multibyte=1
--FILE--
@@ -17,8 +23,8 @@
--EXPECTF--
Warning: Unsupported encoding [1] in %sdeclare_001.php on line %d
-Warning: Unsupported encoding [1.1231312321313E+18] in %sdeclare_001.php on
line %d
+Warning: Unsupported encoding [1123131232131312321] in %sdeclare_001.php on
line %d
Warning: Unsupported encoding [] in %sdeclare_001.php on line %d
-Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d
\ No newline at end of file
+Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d
Modified: php/php-src/trunk/Zend/tests/declare_002.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/declare_002.phpt 2011-06-05 08:59:24 UTC
(rev 311824)
+++ php/php-src/trunk/Zend/tests/declare_002.phpt 2011-06-05 09:35:49 UTC
(rev 311825)
@@ -5,6 +5,9 @@
if (!ini_get("zend.multibyte")) {
die("skip Requires zend.multibyte=1");
}
+if (!extension_loaded("mbstring")) {
+ die("skip Requires ext/mbstring");
+}
?>
--FILE--
<?php
Added: php/php-src/trunk/Zend/tests/declare_003.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/declare_003.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/declare_003.phpt 2011-06-05 09:35:49 UTC
(rev 311825)
@@ -0,0 +1,23 @@
+--TEST--
+Testing declare statement with several type values
+--INI--
+zend.multibyte=1
+--FILE--
+<?php
+
+declare(encoding = 1);
+declare(encoding = 1123131232131312321);
+declare(encoding = NULL);
+declare(encoding = M_PI);
+
+print 'DONE';
+
+?>
+--EXPECTF--
+Warning: Unsupported encoding [1] in %sdeclare_003.php on line %d
+
+Warning: Unsupported encoding [1123131232131312321] in %sdeclare_003.php on
line %d
+
+Warning: Unsupported encoding [] in %sdeclare_003.php on line %d
+
+Fatal error: Cannot use constants as encoding in %sdeclare_003.php on line %d
Added: php/php-src/trunk/Zend/tests/declare_004.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/declare_004.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/declare_004.phpt 2011-06-05 09:35:49 UTC
(rev 311825)
@@ -0,0 +1,27 @@
+--TEST--
+Testing declare statement with several type values
+--SKIPIF--
+<?php
+if (!ini_get("zend.multibyte")) {
+ die("skip Requires zend.multibyte=1");
+}
+?>
+--FILE--
+<?php
+
+declare(encoding = 1);
+declare(encoding = 1123131232131312321);
+declare(encoding = NULL);
+declare(encoding = M_PI);
+
+print 'DONE';
+
+?>
+--EXPECTF--
+Warning: Unsupported encoding [%d] in %sdeclare_004.php on line 3
+
+Warning: Unsupported encoding [%f] in %sdeclare_004.php on line 4
+
+Warning: Unsupported encoding [] in %sdeclare_004.php on line 5
+
+Fatal error: Cannot use constants as encoding in %sdeclare_004.php on line 6
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
