From dbc68b9b88b59c1cf8120d944cd9c07d71c68fea Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 18 Mar 2014 01:16:12 +0400
Subject: [PATCH] Fixed tests (scalar don't have reference counter, other
 values may get different counter values)

---
 .../call_user_func_return.phpt                |   8 +--
 .../general_functions/debug_zval_dump_b.phpt  | Bin 5004 -> 4585 bytes
 .../general_functions/debug_zval_dump_v.phpt  |  50 +++++++++---------
 3 files changed, 29 insertions(+), 29 deletions(-)

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 929fdd7e35..cb0f6998dc 100644
--- 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
GIT binary patch
delta 643
zcmeBCf2q7don4YkS69KaB(*59Br`ux!AL<@mn$bfFI~f8as<1|<PLV3$s5>}Cf{RM
zoXpLkgr?d8uG(;N9EXeys#%5xAnBC+(xjYJ4TH(+IOHbZ;82{*%BduarqBdQp{~*7
z7*4s#ZJf%Jw{j{?e$1&hS(Hm*vLlz`<UB5w$@75hQ(Q`ue{d;JR_9il916tE+*(Yk
zDU;W6YlEm;+&UnNod-;rK&V6r)yJa?lG_8}y@c?@dG$boZV;-J*H1w;MHAJ9#+D!#
zCgtbnXp|I{rcQpxt1wxLPfiY1l?gcXz^c*`bBa?Z=kck7OrFN4B@8sOnoB_;+91}}
z4oLfj`uI$~$EP8ICXTQ|lV200cOkzrh$=_n9fk1T^UH(e_yr^;8w-d{4i!)YD;3ZH
zQ40jXcApRc`}muH0Z33?P!&Y^3Tld?SqzSIgUQnb!L}X{6rKD~P(un$5i~9h4fISW
t>j{ZZ4io}gwUA$Aa-WbW$Ygn8H4t@L2<mur2{&OoPN1P&F8O(>TmZU9vS9!K

delta 1110
zcmaE<+@roho!wBOC^aoPzcjBz!&s9`S69KaB(*59Br`ux!AL<@mn$bfFI~gJSQDXa
zvIDz{5rT`Z%LJ}V7gbvwy9zgww#f_Gl~DMH*p=}(#sY4vA(C5+C;wxYK`}*=Lk@*+
zhQ<%(K()1mLm5T=G!A(aBv+yZiJ>XT87cXtNja$+Mko%s$bss;FK7mfajK(OWW%Y5
z!jIuZbyzK@DvJC<H1!8LQ62u66V-k;E>w99G`<&?Hly+6axl4sO9#ll1R^JKgP3|?
zGKO0h$nFNScY@h3xb=V{5<DQ%gU1g@&ft+pappE21r+{O9(gm|;b{U+V@dh>IT~q+
zImM|cAu7bH4z$3US4+-VvzkjmA=)6;)(%Mfh5Gm)j5O4oT*0fMjH(1|Vo6acvVn$^
zckpTg4ZJ8IGWk0%KcnGf4n9<V1fOOasyT^8MTwOt5p4)|3c@i83g8@qoG1-7fsO>K
zFoZZ4sscH+7*4*(rv!AsS3V6ODbKGCBt7^+fnCmT0A#P^R|S$6_%#(!oddSY04b0R
zC-VtlRiumTpvgW0TB@ifL6fkdfu1RfaT5f@k)qFV@-hKP5NQJ4^G84pNU8{;i!2hf
O<1o?Wa>>t2<pKcirAYz+

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 82ee2a63d5..f4b768a77e 100644
--- 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
-- 
2.40.0