[PATCH] testsuite: inline-cmds.exp: adjust checks with 'finish' command

[PATCH] testsuite: inline-cmds.exp: adjust checks with 'finish' command

[Edjunior Barbosa Machado]

Hi,

as previously discussed in the mailing list (http://sourceware.org/ml/gdb/2010-11/msg00032.html), the behavior of 'finish' command may be slightly different on some architectures (as ppc64, for instance) where there will be one or more instructions after a call instruction that are still part of the subroutine call block. In these cases, after issue 'finish' gdb will show the caller line again instead of the next line.

Please consider the following fix for checks with 'finish' in gdb.opt/inline-cmds.exp. Tested on x86, ppc32 and ppc64.  Ok to apply?

Thanks,
-- 
Edjunior

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0485d21..c576005 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-27  Edjunior Machado  <emachado@linux.vnet.ibm.com>
+
+	* gdb.opt/inline-cmds.exp: Adjust checks with "finish" command to
+	accept to show the caller line again as well as the line after.
+
  2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
  	* gdb.base/gdbindex-stabs-dwarf.c: New file.
diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
index cde86f5..cbf3160 100644
--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
+++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
@@ -263,7 +263,20 @@ gdb_continue_to_breakpoint "finish into func1"
  
  gdb_test "next" ".*marker \\\(\\\);" "next to finish marker"
  gdb_test "step" ".*set breakpoint 2 here.*" "step into finish marker"
-gdb_test "finish" "func1 \\\(\\\);" "finish from marker to func1"
+
+# Some architectures will have one or more instructions after
+# the call instruction which still are part of the call sequence,
+# so it should be expected to return to the caller line after issue
+# a 'finish' command.
+gdb_test_multiple "finish" "finish from marker" {
+    -re "func1 \\\(\\\);.*" {
+        pass "finish from marker to func1"
+    }
+    -re "marker \\\(\\\);.*" {
+        pass "finish from marker"
+        gdb_test "step" "func1 \\\(\\\);.*" "step after marker to reach func1"
+    }
+}
  
  gdb_test "step" "bar \\\(\\\);" "step into func1 for finish"
  gdb_test "finish" "func3 \\\(\\\);" "finish from func1 to func3"
@@ -273,7 +286,15 @@ set line6 [gdb_get_line_number "set breakpoint 6 here"]
  gdb_breakpoint $line6
  gdb_continue_to_breakpoint "before the outer_inline call"
  gdb_test "step" "marker \\\(\\\) at .*" "reach 1 the outer_inline call"
-gdb_test "finish" "main \\\(\\\) at .*outer_inline2 \\\(\\\);" "reach outer_inline2"
+gdb_test_multiple "finish" "finish from marker" {
+    -re "main \\\(\\\) at .*outer_inline2 \\\(\\\);.*" {
+        pass "reach outer_inline2"
+    }
+    -re "main \\\(\\\) at .*marker \\\(\\\);.*" {
+        pass "finish from marker"
+        gdb_test "step" "outer_inline2 \\\(\\\);.*" "step after marker to reach outer_inline2"
+    }
+}
  gdb_test "bt" "#0  main.*" "backtrace at main of outer_inline"
  gdb_test "step" "outer_inline2 \\\(\\\) at .*" "enter outer_inline2"
  gdb_test "bt" "#0  outer_inline2.*#1  main.*" "backtrace at outer_inline2"

Re: [PATCH] testsuite: inline-cmds.exp: adjust checks with 'finish' command

[Jan Kratochvil]

On Wed, 27 Apr 2011 08:42:55 +0200, Edjunior Barbosa Machado wrote:
> Content-Type: text/plain; charset=ISO-8859-1; format=flowed

I could not apply the patch to test it as it is corrupted, both if taken as
raw and if taken as flowed-decoded (at least according to the Mutt decoding).

I am fine with "Content-Disposition: inline" text/plain attachment otherwise
(but not everyone is fine with it here).


> --- a/gdb/testsuite/ChangeLog
> +++ b/gdb/testsuite/ChangeLog
> @@ -1,3 +1,8 @@
> +2011-04-27  Edjunior Machado  <emachado@linux.vnet.ibm.com>
> +
> +	* gdb.opt/inline-cmds.exp: Adjust checks with "finish" command to
> +	accept to show the caller line again as well as the line after.
> +
>  2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
>  	* gdb.base/gdbindex-stabs-dwarf.c: New file.

It is more convenient to provide ChangeLog entry as text - not as diff - as it
is out of sync now.


> diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
> index cde86f5..cbf3160 100644
> --- a/gdb/testsuite/gdb.opt/inline-cmds.exp
> +++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
> @@ -263,7 +263,20 @@ gdb_continue_to_breakpoint "finish into func1"
>  gdb_test "next" ".*marker \\\(\\\);" "next to finish marker"
>  gdb_test "step" ".*set breakpoint 2 here.*" "step into finish marker"
> -gdb_test "finish" "func1 \\\(\\\);" "finish from marker to func1"
> +
> +# Some architectures will have one or more instructions after
> +# the call instruction which still are part of the call sequence,
> +# so it should be expected to return to the caller line after issue
> +# a 'finish' command.
> +gdb_test_multiple "finish" "finish from marker" {
> +    -re "func1 \\\(\\\);.*" {

Missing prompt (it is assumed by gdb_test but not by gdb_test_multiple):
       -re "func1 \\\(\\\);.*\r\n$gdb_prompt $" {

> +        pass "finish from marker to func1"
> +    }
> +    -re "marker \\\(\\\);.*" {

Missing prompt.

> +        pass "finish from marker"
> +        gdb_test "step" "func1 \\\(\\\);.*" "step after marker to reach func1"

Here should be <tab> used for the indentation but that may have been corrupted
by your MUA.


> +    }
> +}
>  gdb_test "step" "bar \\\(\\\);" "step into func1 for finish"
>  gdb_test "finish" "func3 \\\(\\\);" "finish from func1 to func3"
> @@ -273,7 +286,15 @@ set line6 [gdb_get_line_number "set breakpoint 6 here"]
>  gdb_breakpoint $line6
>  gdb_continue_to_breakpoint "before the outer_inline call"
>  gdb_test "step" "marker \\\(\\\) at .*" "reach 1 the outer_inline call"
> -gdb_test "finish" "main \\\(\\\) at .*outer_inline2 \\\(\\\);" "reach outer_inline2"
> +gdb_test_multiple "finish" "finish from marker" {
> +    -re "main \\\(\\\) at .*outer_inline2 \\\(\\\);.*" {

The same prompt issue as above.

> +        pass "reach outer_inline2"
> +    }
> +    -re "main \\\(\\\) at .*marker \\\(\\\);.*" {

The same prompt issue as above.

> +        pass "finish from marker"
> +        gdb_test "step" "outer_inline2 \\\(\\\);.*" "step after marker to reach outer_inline2"

{"outer_inline2 \(\);.*}  would be the same but sure your choice.

> +    }
> +}


Otherwise it would be best if "finish" always stays on the caller line, even
if no instruction is present there.  But that is sure outside of the scope of
this testcase fix.


Thanks,
Jan

Re: [PATCH] testsuite: inline-cmds.exp: adjust checks with 'finish' command

[Edjunior Barbosa Machado]

Thanks Jan for the feedback, and sorry about the confusion with the mail format, I hope it works better now. Here is the updated patch.

Thanks,
-- 
Edjunior


gdb/testsuite/
2011-05-02  Edjunior Machado  <emachado@linux.vnet.ibm.com>

	* gdb.opt/inline-cmds.exp: Adjust checks with "finish" command to
	accept to show the caller line again as well as the line after.

diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
index cde86f5..cb5f96f 100644
--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
+++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
@@ -263,7 +263,20 @@ gdb_continue_to_breakpoint "finish into func1"
 
 gdb_test "next" ".*marker \\\(\\\);" "next to finish marker"
 gdb_test "step" ".*set breakpoint 2 here.*" "step into finish marker"
-gdb_test "finish" "func1 \\\(\\\);" "finish from marker to func1"
+
+# Some architectures will have one or more instructions after
+# the call instruction which still are part of the call sequence,
+# so it should be expected to return to the caller line after issue 
+# a 'finish' command.
+gdb_test_multiple "finish" "finish from marker" {
+    -re "func1 \\\(\\\);.*\r\n$gdb_prompt $" {
+	pass "finish from marker to func1"
+    }
+    -re "marker \\\(\\\);.*\r\n$gdb_prompt $" {
+	pass "finish from marker"
+	gdb_test "step" "func1 \\\(\\\);.*" "step after marker to reach func1"
+    }
+}
 
 gdb_test "step" "bar \\\(\\\);" "step into func1 for finish"
 gdb_test "finish" "func3 \\\(\\\);" "finish from func1 to func3"
@@ -273,7 +286,15 @@ set line6 [gdb_get_line_number "set breakpoint 6 here"]
 gdb_breakpoint $line6
 gdb_continue_to_breakpoint "before the outer_inline call"
 gdb_test "step" "marker \\\(\\\) at .*" "reach 1 the outer_inline call"
-gdb_test "finish" "main \\\(\\\) at .*outer_inline2 \\\(\\\);" "reach outer_inline2"
+gdb_test_multiple "finish" "finish from marker" {
+    -re "main \\\(\\\) at .*outer_inline2 \\\(\\\);.*\r\n$gdb_prompt $" {
+	pass "reach outer_inline2"
+    }
+    -re "main \\\(\\\) at .*marker \\\(\\\);.*\r\n$gdb_prompt $" {
+	pass "finish from marker"
+	gdb_test "step" "outer_inline2 \\\(\\\);.*" "step after marker to reach outer_inline2"
+    }
+}
 gdb_test "bt" "#0  main.*" "backtrace at main of outer_inline"
 gdb_test "step" "outer_inline2 \\\(\\\) at .*" "enter outer_inline2"
 gdb_test "bt" "#0  outer_inline2.*#1  main.*" "backtrace at outer_inline2"

Re: [PATCH] testsuite: inline-cmds.exp: adjust checks with 'finish' command

[Jan Kratochvil]

On Mon, 02 May 2011 16:36:12 +0200, Edjunior Barbosa Machado wrote:
> gdb/testsuite/
> 2011-05-02  Edjunior Machado  <emachado@linux.vnet.ibm.com>
> 
> 	* gdb.opt/inline-cmds.exp: Adjust checks with "finish" command to
> 	accept to show the caller line again as well as the line after.

Yes, please check it in.


Thanks,
Jan

Re: [PATCH] testsuite: inline-cmds.exp: adjust checks with 'finish' command

[Edjunior Barbosa Machado]

On 05/02/2011 12:16 PM, Jan Kratochvil wrote:
> Yes, please check it in.
> 

Checked in:
	http://sourceware.org/ml/gdb-cvs/2011-05/msg00006.html

Thanks,
-- 
Edjunior