Date: Fri Jul 2 17:11:39 CEST 2004
User: Derick Rethans
Directory: xdebug
Log Message:
[0.25]
- More fixes for the tests due to changed output formats.
Modified files:
xdebug/xdebug.c (version: 1.226)
xdebug/tests/array_map.phpt (version: 1.7)
xdebug/tests/assert_test.phpt (version: 1.10)
xdebug/tests/auto_trace.phpt (version: 1.13)
xdebug/tests/test1.phpt (version: 1.13)
xdebug/tests/test12.phpt (version: 1.10)
xdebug/tests/test14.phpt (version: 1.10)
xdebug/tests/test17.phpt (version: 1.10)
xdebug/tests/test18.phpt (version: 1.11)
xdebug/tests/test20.phpt (version: 1.7)
xdebug/tests/test8.phpt (version: 1.12)
[FILE: /xdebug/xdebug.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- xdebug/xdebug.c:1.225 Fri Jul 02 11:53:34 2004 GMT
+++ xdebug/xdebug.c Fri Jul 02 13:11:39 2004 GMT
@@ -1388,6 +1388,8 @@
return return_trace_stack_frame_begin_normal(i TSRMLS_CC);
case 1:
return return_trace_stack_frame_begin_computerized(i, fnr TSRMLS_CC);
+ default:
+ return xdstrdup("");
}
}
@@ -1397,6 +1399,8 @@
switch (XG(trace_format)) {
case 1:
return return_trace_stack_frame_end_computerized(i, fnr TSRMLS_CC);
+ default:
+ return xdstrdup("");
}
}
[FILE: /xdebug/tests/array_map.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdebug/tests/array_map.phpt:1.6 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/array_map.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -15,7 +15,7 @@
$ar = array('a', 'bb', 'ccc');
$r = array_map('strlen', $ar);
-echo gettype($r);
+echo gettype($r), "\n";
echo file_get_contents($tf);
unlink($tf);
[FILE: /xdebug/tests/assert_test.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/tests/assert_test.phpt:1.9 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/assert_test.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -30,6 +30,7 @@
// Make an assertion that should fail
assert (1==2);
+echo "\n";
echo file_get_contents($tf);
unlink($tf);
?>
@@ -45,4 +46,4 @@
%f %d -> assert_options(2, 'my_assert_handler') /%s/assert_test.php:18
%f %d -> assert(FALSE) /%s/assert_test.php:21
%f %d -> my_assert_handler('/%s/assert_test.php', 21, '') /%s/assert_test.php:21
- %f %d -> file_get_contents('/tmp/%s') /%s/assert_test.php:22
+ %f %d -> file_get_contents('/tmp/%s') /%s/assert_test.php:23
[FILE: /xdebug/tests/auto_trace.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xdebug/tests/auto_trace.phpt:1.12 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/auto_trace.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -23,7 +23,6 @@
?>
--EXPECTF--
bar
-
TRACE START [%d-%d-%d %d:%d:%d]
%f %d -> {main}() /%s/auto_trace.php:0
%f %d -> xdebug_get_tracefile_name() /%s/auto_trace.php:2
[FILE: /xdebug/tests/test1.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xdebug/tests/test1.phpt:1.12 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test1.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -20,7 +20,7 @@
include ('test_class.php');
- echo foo (5);
+ echo foo(5), "\n";
echo file_get_contents($tf);
unlink($tf);
?>
[FILE: /xdebug/tests/test12.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/tests/test12.phpt:1.9 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test12.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -19,7 +19,7 @@
$a = array (1, 2,3,4,5);
$b = array ("h" => 9.12, $a, $a, $a, "p" => 9 - 0.12);
- echo a (5, 9.12, FALSE, $b);
+ echo a (5, 9.12, FALSE, $b), "\n";
echo file_get_contents($tf);
unlink($tf);
[FILE: /xdebug/tests/test14.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/tests/test14.phpt:1.9 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test14.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -36,6 +36,6 @@
--EXPECTF--
TRACE START [%d-%d-%d %d:%d:%d]
%f %d -> foo->foo() /%s/test14.php:16
- %f %d -> bar(class foo {var $a = class foo {var $a = class foo {var $a = ...; var $b = ...}; var $b = class foo {var $a = ...; var $b = ...}}; var $b = class foo {var $a = class foo {var $a = ...; var $b = ...}; var $b = class foo {var $a = ...; var $b = ...}}}) /%s/test14.php:17
- %f %d -> bar(class foo {var $a = class foo {var $a = class foo {var $a = ...; var $b = ...}; var $b = class foo {var $a = ...; var $b = ...}}; var $b = class foo {var $a = class foo {var $a = ...; var $b = ...}; var $b = class foo {var $a = ...; var $b = ...}}}) /%s/test14.php:18
+ %f %d -> bar(class foo { var $a = class foo { var $a = ...; var $b = ... }; var $b = class foo { var $a = ...; var $b = ... } }) /%s/test14.php:17
+ %f %d -> bar(class foo { var $a = class foo { var $a = ...; var $b = ... }; var $b = class foo { var $a = ...; var $b = ... } }) /%s/test14.php:18
%f %d -> file_get_contents('/tmp/%s') /%s/test14.php:20
[FILE: /xdebug/tests/test17.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/tests/test17.phpt:1.9 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test17.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -12,7 +12,7 @@
<?php
$tf = xdebug_start_trace('/tmp/'. uniqid('xdt', TRUE));
- echo str_repeat ("5", 5);
+ echo str_repeat ("5", 5), "\n";
echo file_get_contents($tf);
unlink($tf);
[FILE: /xdebug/tests/test18.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xdebug/tests/test18.phpt:1.10 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test18.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -25,7 +25,7 @@
foo();
eval("\$foo = foo();\nbar();\nfoo();\n");
-echo $foo;
+echo $foo, "\n";
echo file_get_contents($tf);
unlink($tf);
?>
[FILE: /xdebug/tests/test20.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdebug/tests/test20.phpt:1.6 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test20.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -25,7 +25,6 @@
?>
--EXPECTF--
test
-
TRACE START [%d-%d-%d %d:%d:%d]
%f %d -> db::query('test') /dat/dev/php/xdebug/tests/test20.php:9
%f %d -> file_get_contents('/tmp/%s') /%s/test20.php:11
[FILE: /xdebug/tests/test8.phpt]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xdebug/tests/test8.phpt:1.11 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test8.phpt Fri Jul 02 13:11:39 2004 GMT
@@ -26,7 +26,7 @@
return $b.$a;
}
-echo c(c(a(),b(2)), c(a(), a()));
+echo c(c(a(),b(2)), c(a(), a())), "\n";
echo file_get_contents($tf);
unlink($tf);
Received on Fri Jul 02 2004 - 17:11:40 BST
This archive was generated by hypermail 2.2.0 : Sun Jun 24 2018 - 04:00:02 BST