[PATCH] Fix gdb.trace/entry-values.exp

[PATCH] Fix gdb.trace/entry-values.exp

[Vidya Praveen]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

Hello

Test gdb.trace/entry-values.exp scans for 'call' instruction in the disassembly
of entry-values.c's object file, causing it to FAIL for targets whose call
instruction is not 'call'.

This patch fixes this for ARM targets by using the right call instruction based
on the target. However, the second part of the test would eventually end as
UNSUPPORTED for ARM targets as it tests gdb trace.

OK?

Regards
VP

~~~

2013-09-30  Vidya Praveen  <vidyapraveen@arm.com>

	* testsuite/gdb.trace/entry-values.exp: Modify regular expression to
	scan for 'bl' instruction instead of 'call' for ARM targets.

[-- Attachment #2: fix-v6.patch --]
[-- Type: text/x-diff, Size: 835 bytes --]

diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index 85306ad..b36a4e4 100644
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -75,10 +75,16 @@ gdb_test_multiple $test $test {
 set bar_length ""
 set bar_call_foo ""
 
+if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } {
+    set call_insn "bl"
+} else {
+    set call_insn "call"
+}
+
 # Calculate the offset of the last instruction from the beginning.
 set test "disassemble bar"
 gdb_test_multiple $test $test {
-    -re ".*$hex <\\+$decimal>:\[ \t\]+call\[^\r\n\]+\r\n\[ \]+$hex <\\+($decimal)>:" {
+    -re ".*$hex <\\+$decimal>:\[ \t\]+$call_insn\[^\r\n\]+\r\n\[ \]+$hex <\\+($decimal)>:" {
 	set bar_call_foo $expect_out(1,string)
 	exp_continue
     }

Re: [PATCH] Fix gdb.trace/entry-values.exp

[Yao Qi]

On 09/30/2013 06:48 PM, Vidya Praveen wrote:
> 2013-09-30  Vidya Praveen<vidyapraveen@arm.com>
>
> 	* testsuite/gdb.trace/entry-values.exp: Modify regular expression to
           ^^^^^^^^^^
Remove "testsuite/".

> 	scan for 'bl' instruction instead of 'call' for ARM targets.

The patch looks right to me, but I can't approve it.

-- 
Yao (齐尧)

Re: [PATCH] Fix gdb.trace/entry-values.exp

[Pedro Alves]

On 09/30/2013 11:48 AM, Vidya Praveen wrote:

> 2013-09-30  Vidya Praveen  <vidyapraveen@arm.com>
> 
> 	* testsuite/gdb.trace/entry-values.exp: Modify regular expression to
> 	scan for 'bl' instruction instead of 'call' for ARM targets.

OK, thanks, but brop "testsuite/".  Paths in ChangeLog entries are
relative to the ChangeLog file's directory, and this entry should go to
testsuite/ChangeLog.

-- 
Pedro Alves

Re: [PATCH] Fix gdb.trace/entry-values.exp

[Vidya Praveen]

On Mon, Sep 30, 2013 at 01:44:21PM +0100, Pedro Alves wrote:
> On 09/30/2013 11:48 AM, Vidya Praveen wrote:
> 
> > 2013-09-30  Vidya Praveen  <vidyapraveen@arm.com>
> > 
> > 	* testsuite/gdb.trace/entry-values.exp: Modify regular expression to
> > 	scan for 'bl' instruction instead of 'call' for ARM targets.
> 
> OK, thanks, but brop "testsuite/".  Paths in ChangeLog entries are
> relative to the ChangeLog file's directory, and this entry should go to
> testsuite/ChangeLog.

Thanks. Here's the corrected one. 

2013-10-02  Vidya Praveen  <vidyapraveen@arm.com>

	* gdb.trace/entry-values.exp: Modify regular expression to scan for 'bl'
	instruction instead of 'call' for ARM targets.

Regards
VP