com php-src: Fixed tests (scalar don't have reference counter, other values may get different counter values): ext/standard/tests/general
_functions/call_user_func_return.phpt ext/standard/ tests/general_functions/debug_zval_dump_b.phpt ext/
standard/tests/general_functions/debug_zval_dump_v.ph pt

Commit: dbc68b9b88b59c1cf8120d944cd9c07d71c68fea Author: Dmitry Stogov <dmitry@zend.com> Tue, 18 Mar 2014 01:16:12 +0400 Parents: 292c01d890725cb5dc1018abbee262ed03013293 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dbc68b9b88b59c1cf8120d944cd9c07d71c68fea Log: Fixed tests (scalar don't have reference counter, other values may get different counter values) Changed paths: M ext/standard/tests/general_functions/call_user_func_return.phpt M ext/standard/tests/general_functions/debug_zval_dump_b.phpt M ext/standard/tests/general_functions/debug_zval_dump_v.phpt Diff: 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 929fdd7..cb0f699 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 e83cdbf...00ec7a8 100644 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 82ee2a6..f4b768a 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