patrickallaert Mon, 08 Nov 2010 09:29:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305192
Log:
- Fixed tests not passing under windows because of the directory separator
difference (thanks Eyal Teutsch for reporting)
Changed paths:
U
php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
U php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug43301.phpt
U php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_034.phpt
U php/php-src/branches/PHP_5_2/ext/pdo_pgsql/tests/bug36727.phpt
U php/php-src/branches/PHP_5_2/ext/reflection/tests/bug42976.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/file/copy_variation12.phpt
U php/php-src/branches/PHP_5_2/ext/sysvshm/tests/002.phpt
U
php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
U php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug43301.phpt
U php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug36727.phpt
U
php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_15_open_error.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation12.phpt
U php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt
U php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt
U php/php-src/trunk/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
U php/php-src/trunk/ext/mbstring/tests/bug43301.phpt
U php/php-src/trunk/ext/pdo_pgsql/tests/bug36727.phpt
U php/php-src/trunk/ext/sqlite3/tests/sqlite3_15_open_error.phpt
U php/php-src/trunk/ext/standard/tests/file/copy_variation12.phpt
U php/php-src/trunk/tests/basic/bug51709_1.phpt
U php/php-src/trunk/tests/basic/bug51709_2.phpt
Modified: php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_stream_filter_delimiter.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_stream_filter_delimiter.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -41,12 +41,12 @@
string(10) "69636f6e76"
string(2) "0a"
-Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP.EUC-JP" in %s/iconv_stream_filter_delimiter.php on line %d
+Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP.EUC-JP" in %siconv_stream_filter_delimiter.php on line %d
string(20) "1b244224332473244b24"
string(10) "41244f1b28"
string(2) "42"
-Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %s/iconv_stream_filter_delimiter.php on line %d
+Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %siconv_stream_filter_delimiter.php on line %d
string(20) "1b244224332473244b24"
string(10) "41244f1b28"
string(2) "42"
Modified: php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug43301.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug43301.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug43301.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -14,7 +14,7 @@
echo mb_ereg_replace($ptr,'$1',$txt,'e');
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %s/bug43301.php(%d) : mbregex replace on line 1
+Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %sbug43301.php(%d) : mbregex replace on line 1
Fatal error: mb_ereg_replace(): Failed evaluating code:
-$1 in %s/bug43301.php on line %d
+$1 in %sbug43301.php on line %d
Modified: php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_034.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_034.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_2/ext/pdo/tests/pdo_034.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -44,9 +44,9 @@
string(1) "4"
}
-Warning: PDOStatement::fetch(): SQLSTATE[HY000]: General error: PDO::FETCH_KEY_PAIR fetch mode requires the result set to contain extactly 2 columns. in %s/pdo_034.php on line %d
+Warning: PDOStatement::fetch(): SQLSTATE[HY000]: General error: PDO::FETCH_KEY_PAIR fetch mode requires the result set to contain extactly 2 columns. in %spdo_034.php on line %d
-Warning: PDOStatement::fetch(): SQLSTATE[HY000]: General error%s/pdo_034.php on line %d
+Warning: PDOStatement::fetch(): SQLSTATE[HY000]: General error%spdo_034.php on line %d
bool(false)
array(5) {
["test0"]=>
Modified: php/php-src/branches/PHP_5_2/ext/pdo_pgsql/tests/bug36727.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_pgsql/tests/bug36727.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_2/ext/pdo_pgsql/tests/bug36727.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -19,6 +19,6 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %s/bug36727.php on line %d
+Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %sbug36727.php on line %d
bool(false)
Done
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_2/ext/reflection/tests/bug42976.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/reflection/tests/bug42976.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_2/ext/reflection/tests/bug42976.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -26,9 +26,9 @@
--EXPECTF--
string(9) "x.changed"
-Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d
+Warning: Invocation of C's constructor failed in %sbug42976.php on line %d
string(10) "x.original"
-Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d
+Warning: Invocation of C's constructor failed in %sbug42976.php on line %d
string(10) "x.original"
Done
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/file/copy_variation12.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/file/copy_variation12.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/file/copy_variation12.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -42,11 +42,11 @@
--EXPECTF--
*** Test copy() function: Trying to create a copy of an existing dir ***
-Warning: copy(): The first argument to copy() function cannot be a directory in %s/copy_variation12.php on line %d
+Warning: copy(): The first argument to copy() function cannot be a directory in %scopy_variation12.php on line %d
bool(false)
bool(false)
int(%d)
-Warning: filesize(): stat failed for %s/copy_copy_variation12 in %s/copy_variation12.php on line %d
+Warning: filesize(): stat failed for %scopy_copy_variation12 in %scopy_variation12.php on line %d
bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_2/ext/sysvshm/tests/002.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sysvshm/tests/002.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_2/ext/sysvshm/tests/002.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -33,33 +33,33 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: Wrong parameter count for shm_attach() in %s/sysvshm/tests/002.php on line %d
+Warning: Wrong parameter count for shm_attach() in %s002.php on line %d
NULL
-Warning: Wrong parameter count for shm_attach() in %s/sysvshm/tests/002.php on line %d
+Warning: Wrong parameter count for shm_attach() in %s002.php on line %d
NULL
-Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
+Warning: shm_attach(): Segment size must be greater then zero. in %s002.php on line %d
bool(false)
-Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
+Warning: shm_attach(): Segment size must be greater then zero. in %s002.php on line %d
bool(false)
-Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
+Warning: shm_attach(): Segment size must be greater then zero. in %s002.php on line %d
bool(false)
-Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
+Warning: shm_attach(): Segment size must be greater then zero. in %s002.php on line %d
bool(false)
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s/sysvshm/tests/002.php on line %d
+Warning: shm_remove(): The parameter is not a valid shm_identifier in %s002.php on line %d
-Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
+Warning: shm_attach(): Segment size must be greater then zero. in %s002.php on line %d
bool(false)
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s/sysvshm/tests/002.php on line %d
+Warning: shm_remove(): The parameter is not a valid shm_identifier in %s002.php on line %d
int(%d)
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s/sysvshm/tests/002.php on line %d
+Warning: shm_remove(): The parameter is not a valid shm_identifier in %s002.php on line %d
int(%d)
int(%d)
int(%d)
Modified: php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter_delimiter.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter_delimiter.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -44,7 +44,7 @@
string(10) "69636f6e76"
string(2) "0a"
-Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %s/iconv_stream_filter_delimiter.php on line %d
+Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %siconv_stream_filter_delimiter.php on line %d
string(20) "1b244224332473244b24"
string(10) "41244f1b28"
string(2) "42"
Modified: php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug43301.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug43301.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug43301.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -15,7 +15,7 @@
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %s/bug43301.php(%d) : mbregex replace on line 1
+Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %sbug43301.php(%d) : mbregex replace on line 1
Fatal error: mb_ereg_replace(): Failed evaluating code:
-$1 in %s/bug43301.php on line %d
+$1 in %sbug43301.php on line %d
Modified: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug36727.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug36727.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug36727.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -19,6 +19,6 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %s/bug36727.php on line %d
+Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %sbug36727.php on line %d
bool(false)
Done
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_15_open_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_15_open_error.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_15_open_error.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -16,8 +16,8 @@
unlink($unreadable);
?>
--EXPECTF--
-exception 'Exception' with message 'Unable to open database: %s' in %s/sqlite3_15_open_error.php:%d
+exception 'Exception' with message 'Unable to open database: %s' in %ssqlite3_15_open_error.php:%d
Stack trace:
-#0 %s/sqlite3_15_open_error.php(%d): SQLite3->__construct('%s')
+#0 %ssqlite3_15_open_error.php(%d): SQLite3->__construct('%s')
#1 {main}
Done
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation12.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation12.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation12.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -41,11 +41,11 @@
--EXPECTF--
*** Test copy() function: Trying to create a copy of an existing dir ***
-Warning: copy(): The first argument to copy() function cannot be a directory in %s/copy_variation12.php on line %d
+Warning: copy(): The first argument to copy() function cannot be a directory in %scopy_variation12.php on line %d
bool(false)
bool(false)
int(%d)
-Warning: filesize(): stat failed for %s/copy_copy_variation12 in %s/copy_variation12.php on line %d
+Warning: filesize(): stat failed for %scopy_copy_variation12 in %scopy_variation12.php on line %d
bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -13,4 +13,4 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-Parse error: syntax error, unexpected T_FOR, expecting T_STRING in %s/bug51709_1.php on line %d
+Parse error: syntax error, unexpected T_FOR, expecting T_STRING in %sbug51709_1.php on line %d
Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -13,4 +13,4 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-Parse error: syntax error, unexpected T_GOTO, expecting T_STRING in %s/bug51709_2.php on line %d
+Parse error: syntax error, unexpected T_GOTO, expecting T_STRING in %sbug51709_2.php on line %d
Modified: php/php-src/trunk/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
===================================================================
--- php/php-src/trunk/ext/iconv/tests/iconv_stream_filter_delimiter.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/trunk/ext/iconv/tests/iconv_stream_filter_delimiter.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -44,7 +44,7 @@
string(10) "69636f6e76"
string(2) "0a"
-Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %s/iconv_stream_filter_delimiter.php on line %d
+Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %siconv_stream_filter_delimiter.php on line %d
string(20) "1b244224332473244b24"
string(10) "41244f1b28"
string(2) "42"
Modified: php/php-src/trunk/ext/mbstring/tests/bug43301.phpt
===================================================================
--- php/php-src/trunk/ext/mbstring/tests/bug43301.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/trunk/ext/mbstring/tests/bug43301.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -15,7 +15,7 @@
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %s/bug43301.php(%d) : mbregex replace on line 1
+Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %sbug43301.php(%d) : mbregex replace on line 1
Fatal error: mb_ereg_replace(): Failed evaluating code:
-$1 in %s/bug43301.php on line %d
+$1 in %sbug43301.php on line %d
Modified: php/php-src/trunk/ext/pdo_pgsql/tests/bug36727.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_pgsql/tests/bug36727.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/trunk/ext/pdo_pgsql/tests/bug36727.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -19,6 +19,6 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %s/bug36727.php on line %d
+Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %sbug36727.php on line %d
bool(false)
Done
\ No newline at end of file
Modified: php/php-src/trunk/ext/sqlite3/tests/sqlite3_15_open_error.phpt
===================================================================
--- php/php-src/trunk/ext/sqlite3/tests/sqlite3_15_open_error.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/trunk/ext/sqlite3/tests/sqlite3_15_open_error.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -16,8 +16,8 @@
unlink($unreadable);
?>
--EXPECTF--
-exception 'Exception' with message 'Unable to open database: %s' in %s/sqlite3_15_open_error.php:%d
+exception 'Exception' with message 'Unable to open database: %s' in %ssqlite3_15_open_error.php:%d
Stack trace:
-#0 %s/sqlite3_15_open_error.php(%d): SQLite3->__construct('%s')
+#0 %ssqlite3_15_open_error.php(%d): SQLite3->__construct('%s')
#1 {main}
Done
Modified: php/php-src/trunk/ext/standard/tests/file/copy_variation12.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/copy_variation12.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/trunk/ext/standard/tests/file/copy_variation12.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -41,11 +41,11 @@
--EXPECTF--
*** Test copy() function: Trying to create a copy of an existing dir ***
-Warning: copy(): The first argument to copy() function cannot be a directory in %s/copy_variation12.php on line %d
+Warning: copy(): The first argument to copy() function cannot be a directory in %scopy_variation12.php on line %d
bool(false)
bool(false)
int(%d)
-Warning: filesize(): stat failed for %s/copy_copy_variation12 in %s/copy_variation12.php on line %d
+Warning: filesize(): stat failed for %scopy_copy_variation12 in %scopy_variation12.php on line %d
bool(false)
*** Done ***
Modified: php/php-src/trunk/tests/basic/bug51709_1.phpt
===================================================================
--- php/php-src/trunk/tests/basic/bug51709_1.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/trunk/tests/basic/bug51709_1.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -13,4 +13,4 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-Parse error: syntax error, unexpected T_FOR, expecting T_STRING in %s/bug51709_1.php on line %d
+Parse error: syntax error, unexpected T_FOR, expecting T_STRING in %sbug51709_1.php on line %d
Modified: php/php-src/trunk/tests/basic/bug51709_2.phpt
===================================================================
--- php/php-src/trunk/tests/basic/bug51709_2.phpt 2010-11-08 09:14:48 UTC (rev 305191)
+++ php/php-src/trunk/tests/basic/bug51709_2.phpt 2010-11-08 09:29:15 UTC (rev 305192)
@@ -13,4 +13,4 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-Parse error: syntax error, unexpected T_GOTO, expecting T_STRING in %s/bug51709_2.php on line %d
+Parse error: syntax error, unexpected T_GOTO, expecting T_STRING in %sbug51709_2.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
