- Fixed tests not passing under windows because of the directory separator

difference (thanks Eyal Teutsch for reporting)

diff --git a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
index e28ebab293c3ba8168bae94911e6866120113acd..895f614ef8e8b13631f4613ddf453f6c2f0e9064 100644 (file)
--- a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
+++ b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
@@ -44,7 +44,7 @@ string(20) "a4b3a4f3a4cba4c1a4cf"
 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"

diff --git a/ext/mbstring/tests/bug43301.phpt b/ext/mbstring/tests/bug43301.phpt
index 71b169c12cc8013bdfc304ce90f5034a60e6385a..310426a14286e85e5f89ba652305c7d0ef443521 100644 (file)
--- a/ext/mbstring/tests/bug43301.phpt
+++ b/ext/mbstring/tests/bug43301.phpt
@@ -15,7 +15,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

diff --git a/ext/pdo_pgsql/tests/bug36727.phpt b/ext/pdo_pgsql/tests/bug36727.phpt
index f1b906bd678a57f5c8e9e210c37780ecaa0505ed..34d14db6cc19a19c9861fe8effe86381292686c3 100644 (file)
--- a/ext/pdo_pgsql/tests/bug36727.phpt
+++ b/ext/pdo_pgsql/tests/bug36727.phpt
@@ -19,6 +19,6 @@ var_dump($stmt->bindValue(':test', 1, PDO::PARAM_INT));
 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

diff --git a/ext/sqlite3/tests/sqlite3_15_open_error.phpt b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
index 1fcaca9c724a3cde0f530b8dfea643c4e58a2099..49168fd19b77609d3d594b14be06aa2e7e471af3 100644 (file)
--- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
@@ -16,8 +16,8 @@ echo "Done\n";
 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

diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt
index 34667ba799bf0dfba6c424f85494d4e0c0820ea9..7f96fd050d7b6eebdb40090e5450f0f981c9ed16 100644 (file)
--- a/ext/standard/tests/file/copy_variation12.phpt
+++ b/ext/standard/tests/file/copy_variation12.phpt
@@ -41,11 +41,11 @@ rmdir(dirname(__FILE__)."/copy_variation12");
 --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 ***

diff --git a/tests/basic/bug51709_1.phpt b/tests/basic/bug51709_1.phpt
index e929df38445563a1ca37f961d323beaff7fe8fe1..8abb92555d7828b50d83fa87a8b772ff9428c152 100644 (file)
--- a/tests/basic/bug51709_1.phpt
+++ b/tests/basic/bug51709_1.phpt
@@ -13,4 +13,4 @@ class foo {
 ===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

diff --git a/tests/basic/bug51709_2.phpt b/tests/basic/bug51709_2.phpt
index b6224abcf702bac1e2cc274c609a901ab2981bb1..7763cafe523994dc674c480ee47a53816804e867 100644 (file)
--- a/tests/basic/bug51709_2.phpt
+++ b/tests/basic/bug51709_2.phpt
@@ -13,4 +13,4 @@ class foo {
 ===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