From: Nikita Popov <nikic@php.net>
Date: Wed, 12 Oct 2016 20:41:59 +0000 (+0200)
Subject: Fix phpdbg tests after lineno change
X-Git-Tag: php-7.1.0RC4~21^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe378c27cc61c07189b32c2348a6a4306823c50e;p=php

Fix phpdbg tests after lineno change
---

diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt
index fffe7a9296..252fe32f1a 100644
--- 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
-[L10 %s RETURN                  1                                                              %s]
-[Script ended normally]
+[L14 %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 3c92cebbdb..b07d954303 100644
--- 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
-[L8 %s RETURN                  1                                                              %s]
-[Script ended normally]
+[L9 %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 1f7a5ac0b9..94ccedc3cf 100644
--- 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                                                                              
- L19   #10    RETURN                  1                                                             
+ L21   #10    RETURN                  1                                                             
 prompt> 
 --FILE--
 <?php
diff --git a/sapi/phpdbg/tests/stepping_001.phpt b/sapi/phpdbg/tests/stepping_001.phpt
index 5c92ba2f0b..9c3429897b 100644
--- 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 1183bb0e57..ea7da1a87d 100644
--- 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>