Fixed tests (scalar don't have reference counter, other values may get different...

diff --git a/ext/standard/tests/general_functions/call_user_func_return.phpt b/ext/standard/tests/general_functions/call_user_func_return.phpt
index 929fdd7e35c1b7aa8e11d279182d4f1879203dfb..cb0f6998dce03b6bf0c0e2d698f3b6d52f65e954 100644 (file)
--- a/ext/standard/tests/general_functions/call_user_func_return.phpt
+++ b/ext/standard/tests/general_functions/call_user_func_return.phpt
@@ -34,11 +34,11 @@ test('test2');
 ===DONE===
 --EXPECTF--
 Direct Call
-string(5) "test1" refcount(1)
+string(5) "test1" refcount(%d)
 User Func
-string(5) "test1" refcount(1)
+string(5) "test1" refcount(%d)
 Direct Call
-string(5) "test2" refcount(2)
+string(5) "test2" refcount(%d)
 User Func
-string(5) "test2" refcount(1)
+string(5) "test2" refcount(%d)
 ===DONE===

diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt
index e83cdbf5405586375ff29c6c8cd3255c1689526d..00ec7a88a4a34bbd6726f04e9657ceb03cddc580 100644 (file)
Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt differ

diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
index 82ee2a63d57c4aa24b3f962b09ea3f668bf22dc8..f4b768a77ed2b89351cae389c6a0c53a8b4c83a9 100644 (file)
--- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
@@ -124,81 +124,81 @@ echo "Done\n";
 --- Variation 1: global variable inside a function ---
 
 -- Value of global variable, before calling dump_globalvar() --
-long(10) refcount(2)
+long(10)
 
 -- Value of local variable inside dump_globalvar() --
-long(10) refcount(1)
+long(10)
 
 -- Value of global variable inside dump_globalvar() --
-long(10) refcount(1)
+long(10)
 
 -- Value of global variable, after exiting dump_globalvar() --
-long(10) refcount(2)
+long(10)
 
 --- Variation 2: one variable references another ---
 
 -- Value of $first_var: --
-long(10) refcount(2)
+long(10)
 
 -- Value of $ref_first_var --
-NULL refcount(1)
+NULL
 
 -- Value of $first_var --
-long(10) refcount(2)
+long(10)
 
 -- Value of $ref_first_var --
 
 Notice: Undefined variable: ref_first_var in %s on line %d
-NULL refcount(1)
+NULL
 
 -- Value of $first_var --
-long(10) refcount(2)
+long(10)
 
 --- Variation 3: multiple references of variables ---
 
 -- Value of $var_1: (before referencing) --
-long(10) refcount(1)
+long(10)
 
 -- Value of $var_2: (referencing var_1) --
-long(10) refcount(1)
+long(10)
 
 -- Value of $var_3: (referencing var_2) --
-long(10) refcount(1)
+long(10)
 
 -- Value of $var_3: (after unsetting var_3) --
 
 Notice: Undefined variable: var_3 in %s on line %d
-NULL refcount(1)
+NULL
 
 -- Value of $var_2: --
-long(10) refcount(1)
+long(10)
 
 -- Value of $var_3: --
-long(10) refcount(1)
+long(10)
 
 -- Value of $var_1: (after unsetting variable_1) --
 
 Notice: Undefined variable: var_1 in %s on line %d
-NULL refcount(1)
+NULL
 
 -- Value of $var_2: --
-long(10) refcount(2)
+long(10)
 
 *** Testing debug_zval_dump() on miscelleneous input arguments ***
 -- Iteration 1 --
-NULL refcount(3)
+NULL
 -- Iteration 2 --
-NULL refcount(3)
+NULL
 -- Iteration 3 --
-NULL refcount(1)
+NULL
 -- Iteration 4 --
-NULL refcount(1)
+NULL
 -- Iteration 5 --
-string(7) "TRUE123" refcount(3)
+string(7) "TRUE123" refcount(%d)
 -- Iteration 6 --
-string(9) "123string" refcount(3)
+string(9) "123string" refcount(%d)
 -- Iteration 7 --
-string(9) "string123" refcount(3)
+string(9) "string123" refcount(%d)
 -- Iteration 8 --
-string(10) "NULLstring" refcount(3)
+string(10) "NULLstring" refcount(%d)
 Done