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

difference (thanks Eyal Teutsch for reporting)

7 files changed, 21 insertions, 21 deletions

diff --git a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
index c3cbdff8c7..7c3652c318 100644
--- a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
+++ b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
@@ -41,12 +41,12 @@ string(20) "a4b3a4f3a4cba4c1a4cf"
 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"
diff --git a/ext/mbstring/tests/bug43301.phpt b/ext/mbstring/tests/bug43301.phpt
index 858520fdf9..bb561c550c 100644
--- a/ext/mbstring/tests/bug43301.phpt
+++ b/ext/mbstring/tests/bug43301.phpt
@@ -14,7 +14,7 @@ doc;
 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/tests/pdo_034.phpt b/ext/pdo/tests/pdo_034.phpt
index 3b30cdc3ea..3803c2f4ef 100644
--- a/ext/pdo/tests/pdo_034.phpt
+++ b/ext/pdo/tests/pdo_034.phpt
@@ -44,9 +44,9 @@ array(5) {
   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"]=>
diff --git a/ext/pdo_pgsql/tests/bug36727.phpt b/ext/pdo_pgsql/tests/bug36727.phpt
index f1b906bd67..34d14db6cc 100644
--- 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/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt
index 38aed3a400..a5212a2a0a 100644
--- a/ext/reflection/tests/bug42976.phpt
+++ b/ext/reflection/tests/bug42976.phpt
@@ -26,9 +26,9 @@ echo "Done\n";
 --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
diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt
index 76d386e6e9..a6c68d6ffb 100644
--- a/ext/standard/tests/file/copy_variation12.phpt
+++ b/ext/standard/tests/file/copy_variation12.phpt
@@ -42,11 +42,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/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index 21651dee58..e1045b6d2f 100644
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -33,33 +33,33 @@ shm_remove($s);
 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)