projects
/
php
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b429fe
)
Fix phpdbg tests after lineno change
author
Nikita Popov
<nikic@php.net>
Wed, 12 Oct 2016 20:41:59 +0000
(22:41 +0200)
committer
Nikita Popov
<nikic@php.net>
Wed, 12 Oct 2016 20:41:59 +0000
(22:41 +0200)
sapi/phpdbg/tests/exceptions_003.phpt
patch
|
blob
|
history
sapi/phpdbg/tests/next_001.phpt
patch
|
blob
|
history
sapi/phpdbg/tests/print_001.phpt
patch
|
blob
|
history
sapi/phpdbg/tests/stepping_001.phpt
patch
|
blob
|
history
sapi/phpdbg/tests/watch_001.phpt
patch
|
blob
|
history
diff --git
a/sapi/phpdbg/tests/exceptions_003.phpt
b/sapi/phpdbg/tests/exceptions_003.phpt
index fffe7a9296bbb0e557b08947960fc401ccd9db74..252fe32f1a60045ef1d25e28fd8a4d7e0a2143d3 100644
(file)
--- a/
sapi/phpdbg/tests/exceptions_003.phpt
+++ b/
sapi/phpdbg/tests/exceptions_003.phpt
@@
-35,8
+35,8
@@
prompt> [L10 %s ECHO "caught "
00011: }
00012:
prompt> caught
-[L1
0
%s RETURN 1 %s]
-[Script ended normally]
+[L1
4
%s RETURN 1 %s]
+>00014:
prompt>
--FILE--
<?php
diff --git
a/sapi/phpdbg/tests/next_001.phpt
b/sapi/phpdbg/tests/next_001.phpt
index 3c92cebbdb87753c7348a462f389ec52ea6b41ae..b07d954303c6c976ce9cc5015cd29501c801cd38 100644
(file)
--- a/
sapi/phpdbg/tests/next_001.phpt
+++ b/
sapi/phpdbg/tests/next_001.phpt
@@
-23,8
+23,8
@@
prompt> [L8 %s ECHO 1
>00008: echo 1;
00009:
prompt> 1
-[L
8
%s RETURN 1 %s]
-[Script ended normally]
+[L
9
%s RETURN 1 %s]
+>00009:
prompt>
--FILE--
<?php
diff --git
a/sapi/phpdbg/tests/print_001.phpt
b/sapi/phpdbg/tests/print_001.phpt
index 1f7a5ac0b94043accebb5efb12af67e1c0f7f9ca..94ccedc3cf4812e43e1abb361152b900c5b65aed 100644
(file)
--- a/
sapi/phpdbg/tests/print_001.phpt
+++ b/
sapi/phpdbg/tests/print_001.phpt
@@
-31,7
+31,7
@@
L9-9 Foo\Bar::baz() %s - %s + 1 ops
L9 #0 RETURN null
prompt> [Not Executing!]
prompt> [Context %s (11 ops)]
-L1-
19
{main}() %s - %s + 11 ops
+L1-
21
{main}() %s - %s + 11 ops
L4 #0 NOP
L14 #1 NOP
L18 #2 NEW "Foo\\Bar" @1
@@
-42,7
+42,7
@@
L1-19 {main}() %s - %s + 11 ops
L19 #7 INIT_FCALL%s %d %s "foo"
L19 #8 SEND_VAL "test" 1
L19 #9 DO_FCALL
- L
19
#10 RETURN 1
+ L
21
#10 RETURN 1
prompt>
--FILE--
<?php
diff --git
a/sapi/phpdbg/tests/stepping_001.phpt
b/sapi/phpdbg/tests/stepping_001.phpt
index 5c92ba2f0b5fb5ec89e0b0eff9785158fe10bfd2..9c3429897b713be9b47494de776a4d4a275615c2 100644
(file)
--- a/
sapi/phpdbg/tests/stepping_001.phpt
+++ b/
sapi/phpdbg/tests/stepping_001.phpt
@@
-46,10
+46,8
@@
prompt> ... ok
>00011: } finally {
00012: echo " ... ok";
00013: }
-prompt> [L12 %s RETURN 1 %s]
->00012: echo " ... ok";
- 00013: }
- 00014:
+prompt> [L14 %s RETURN 1 %s]
+>00014:
prompt>
--FILE--
<?php
diff --git
a/sapi/phpdbg/tests/watch_001.phpt
b/sapi/phpdbg/tests/watch_001.phpt
index 1183bb0e5728074636f20d0315a21f117fe67d4c..ea7da1a87d48bb91683bd957c700315ee9a788ee 100644
(file)
--- a/
sapi/phpdbg/tests/watch_001.phpt
+++ b/
sapi/phpdbg/tests/watch_001.phpt
@@
-31,8
+31,7
@@
New value:
prompt> [Breaking on watchpoint $b]
Old value:
New value: 2
->00007: $b = 2;
- 00008:
+>00008:
prompt> [$b was removed, removing watchpoint recursively]
[Script ended normally]
prompt>