From: Anatol Belski <ab@php.net>
Date: Fri, 28 Feb 2014 08:43:57 +0000 (+0100)
Subject: primitive test fixes
X-Git-Tag: php-5.6.0beta1~3^2~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cb4398ac1354911fc56217856cef4aa25aa32c4;p=php

primitive test fixes
---

diff --git a/ext/session/tests/016.phpt b/ext/session/tests/016.phpt
index 0e368e2f82..82a85d2705 100644
--- a/ext/session/tests/016.phpt
+++ b/ext/session/tests/016.phpt
@@ -22,5 +22,5 @@ session_write_close();
 print "I live\n";
 ?>
 --EXPECTF--
-Warning: session_write_close(): Failed to write session data (files). Please verify that the current setting of session.save_path is correct (123;:/really\completely:::/invalid;;,23123;213) in %s on line %d
+Warning: session_write_close(): Failed to write session data (files). Please verify that the current setting of session.save_path is correct (123;:/really%scompletely:::/invalid;;,23123;213) in %s on line %d
 I live
diff --git a/ext/session/tests/session_hash_function_basic.phpt b/ext/session/tests/session_hash_function_basic.phpt
index 663852d9d1..a9c921581b 100644
--- a/ext/session/tests/session_hash_function_basic.phpt
+++ b/ext/session/tests/session_hash_function_basic.phpt
@@ -43,7 +43,7 @@ bool(true)
 string(40) "%s"
 bool(true)
 
-Warning: ini_set(): session.configuration 'session.hash_function' must be existing hash function. none does not exist. in %s/session_hash_function_basic.php on line 17
+Warning: ini_set(): session.configuration 'session.hash_function' must be existing hash function. none does not exist. in %s%esession_hash_function_basic.php on line 17
 bool(false)
 bool(true)
 bool(true)
diff --git a/ext/session/tests/session_save_path_variation2.phpt b/ext/session/tests/session_save_path_variation2.phpt
index dff070100c..4cf44b75a4 100644
--- a/ext/session/tests/session_save_path_variation2.phpt
+++ b/ext/session/tests/session_save_path_variation2.phpt
@@ -32,7 +32,7 @@ ob_end_flush();
 *** Testing session_save_path() : variation ***
 string(5) "/blah"
 
-Warning: session_start(): open(/blah/%s, O_RDWR) failed: No such file or directory (2) in %s on line %d
+Warning: session_start(): open(%sblah%e%s, O_RDWR) failed: No such file or directory (2) in %s on line %d
 bool(true)
 string(5) "/blah"
 bool(true)
diff --git a/ext/session/tests/session_serializer_name_basic.phpt b/ext/session/tests/session_serializer_name_basic.phpt
index ca292dd36f..b0560dc180 100644
--- a/ext/session/tests/session_serializer_name_basic.phpt
+++ b/ext/session/tests/session_serializer_name_basic.phpt
@@ -30,7 +30,7 @@ string(3) "php"
 bool(true)
 bool(true)
 
-Warning: session_serializer_name(): Cannot find serialization handler 'none' in %s/session_serializer_name_basic.php on line 16
+Warning: session_serializer_name(): Cannot find serialization handler 'none' in %s%esession_serializer_name_basic.php on line 16
 bool(false)
 string(10) "php_binary"
 Done
diff --git a/ext/spl/tests/bug64782.phpt b/ext/spl/tests/bug64782.phpt
index ac5d08d7d1..ffe8a30b26 100644
--- a/ext/spl/tests/bug64782.phpt
+++ b/ext/spl/tests/bug64782.phpt
@@ -9,7 +9,7 @@ var_dump(new SplFileObject(__FILE__, "r", false, null));
 --EXPECTF--
 object(SplFileObject)#1 (%d) {
   ["pathName":"SplFileInfo":private]=>
-  string(%d) "%s/bug64782.php"
+  string(%d) "%sbug64782.php"
   ["fileName":"SplFileInfo":private]=>
   string(12) "bug64782.php"
   ["openMode":"SplFileObject":private]=>