[PATCH] testsuite: break-entry.exp: convert entry point for ppc64

[PATCH] testsuite: break-entry.exp: convert entry point for ppc64

[emachado]

From: Edjunior Barbosa Machado <emachado@linux.vnet.ibm.com>

Hi,

This patch intents to collect the correct entry point address for ppc64,
since the address from `info files' points to the function descriptor.
It also changes the last test, in order to permit the `.' prefix, found
on ppc64's symbols.

Is that ok?

Thanks,
--
Edjunior Machado

gdb/testsuite/
2010-10-01  Edjunior Machado  <emachado@br.ibm.com>
	    Luis Machado  <luisgpm@br.ibm.com>

	* testsuite/gdb.base/break-entry.exp: convert entry point for
	ppc64 and expect leading `.' on ppc64's symbols
---
 gdb/testsuite/gdb.base/break-entry.exp |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp
index d4b86a3..7e4b36f 100644
--- a/gdb/testsuite/gdb.base/break-entry.exp
+++ b/gdb/testsuite/gdb.base/break-entry.exp
@@ -34,10 +34,20 @@ if {$entry == ""} {
     return
 }
 
+if {[istarget powerpc64-*] && [is_lp64_target]} {
+    set test "convert entry point"
+    gdb_test_multiple "p *(void(*)(void) *) $entry" $test {
+	-re " =( \\(\[^0-9\]*\\))? (0x\[0-9a-f\]+)( <.*\[^\r\n\]*)?\r\n$gdb_prompt $" {
+	    set entry $expect_out(2,string)
+	    pass $test
+	}
+    }
+}
+
 if ![runto "*$entry"] {
     return
 }
 gdb_test {p/x $pc} " = $entry"
 
 gdb_breakpoint "main"
-gdb_continue_to_breakpoint "main" "main.*"
+gdb_continue_to_breakpoint "main" "\.?main.*"
-- 
1.7.1

Re: [PATCH] testsuite: break-entry.exp: convert entry point for ppc64

[Jan Kratochvil]

On Sat, 02 Oct 2010 03:08:22 +0200, emachado@linux.vnet.ibm.com wrote:
> gdb/testsuite/
> 2010-10-01  Edjunior Machado  <emachado@br.ibm.com>
> 	    Luis Machado  <luisgpm@br.ibm.com>
> 
> 	* testsuite/gdb.base/break-entry.exp: convert entry point for
          ^^^^^^^^^^ = excessive.

> 	ppc64 and expect leading `.' on ppc64's symbols


> --- a/gdb/testsuite/gdb.base/break-entry.exp
> +++ b/gdb/testsuite/gdb.base/break-entry.exp

> +if {[istarget powerpc64-*] && [is_lp64_target]} {
> +    set test "convert entry point"
> +    gdb_test_multiple "p *(void(*)(void) *) $entry" $test {
> +	-re " =( \\(\[^0-9\]*\\))? (0x\[0-9a-f\]+)( <.*\[^\r\n\]*)?\r\n$gdb_prompt $" {

There should be either `<\[^\r\n\]*)' or `<.*)' but the combination
`<.*\[^\r\n\]*' has the second part redundant.


>  gdb_breakpoint "main"
> -gdb_continue_to_breakpoint "main" "main.*"
> +gdb_continue_to_breakpoint "main" "\.?main.*"

"\.?main.*" is the same as ".?main.*".  You should use "\\.?main.*" as one
backslash is eaten by the tcl interpreter while the second one by regex.
One can also use {\.?main.*}.


OK with those fixups.


Thanks,
Jan

Re: [PATCH] testsuite: break-entry.exp: convert entry point for ppc64

[Edjunior Barbosa Machado]

Thanks Jan for the feedback.
Sending the updated patch with the changes you suggested.

Thanks,
Edjunior


gdb/testsuite/
2010-10-01  Edjunior Machado  <emachado@br.ibm.com>
	    Luis Machado  <luisgpm@br.ibm.com>

	* gdb.base/break-entry.exp: convert entry point for
	ppc64 and expect leading `.' on ppc64's symbols

diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp
index d4b86a3..1360504 100644
--- a/gdb/testsuite/gdb.base/break-entry.exp
+++ b/gdb/testsuite/gdb.base/break-entry.exp
@@ -34,10 +34,20 @@ if {$entry == ""} {
     return
 }
 
+if {[istarget powerpc64-*] && [is_lp64_target]} {
+    set test "convert entry point"
+    gdb_test_multiple "p *(void(*)(void) *) $entry" $test {
+	-re " =( \\(\[^0-9\]*\\))? (0x\[0-9a-f\]+)( <.*)?\r\n$gdb_prompt $" {
+	    set entry $expect_out(2,string)
+	    pass $test
+	}
+    }
+}
+
 if ![runto "*$entry"] {
     return
 }
 gdb_test {p/x $pc} " = $entry"
 
 gdb_breakpoint "main"
-gdb_continue_to_breakpoint "main" "main.*"
+gdb_continue_to_breakpoint "main" "\\.?main.*"

Re: [PATCH] testsuite: break-entry.exp: convert entry point for ppc64

[Edjunior Barbosa Machado]

Hi,

On 10/07/2010 11:44 AM, Edjunior Barbosa Machado wrote:
> Thanks Jan for the feedback.
> Sending the updated patch with the changes you suggested.
>
> Thanks,
> Edjunior
>
>
> gdb/testsuite/
> 2010-10-01  Edjunior Machado<emachado@br.ibm.com>
> 	Luis Machado<luisgpm@br.ibm.com>
>
> 	* gdb.base/break-entry.exp: convert entry point for
> 	ppc64 and expect leading `.' on ppc64's symbols
>
> diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp
> index d4b86a3..1360504 100644
> --- a/gdb/testsuite/gdb.base/break-entry.exp
> +++ b/gdb/testsuite/gdb.base/break-entry.exp
> @@ -34,10 +34,20 @@ if {$entry == ""} {
>       return
>   }
>
> +if {[istarget powerpc64-*]&&  [is_lp64_target]} {
> +    set test "convert entry point"
> +    gdb_test_multiple "p *(void(*)(void) *) $entry" $test {
> +	-re " =( \\(\[^0-9\]*\\))? (0x\[0-9a-f\]+)(<.*)?\r\n$gdb_prompt $" {
> +	    set entry $expect_out(2,string)
> +	    pass $test
> +	}
> +    }
> +}
> +
>   if ![runto "*$entry"] {
>       return
>   }
>   gdb_test {p/x $pc} " = $entry"
>
>   gdb_breakpoint "main"
> -gdb_continue_to_breakpoint "main" "main.*"
> +gdb_continue_to_breakpoint "main" "\\.?main.*"
>

ping.

Thanks,
Edjunior

Re: [PATCH] testsuite: break-entry.exp: convert entry point for ppc64

[Jan Kratochvil]

On Thu, 07 Oct 2010 16:44:27 +0200, Edjunior Barbosa Machado wrote:
> Thanks Jan for the feedback.
> Sending the updated patch with the changes you suggested.

Checked-in, sorry for the delay.


Regards,
Jan


http://sourceware.org/ml/gdb-cvs/2010-11/msg00040.html

--- src/gdb/testsuite/ChangeLog	2010/11/05 17:07:35	1.2501
+++ src/gdb/testsuite/ChangeLog	2010/11/08 18:05:55	1.2502
@@ -1,3 +1,9 @@
+2010-11-08  Edjunior Machado  <emachado@br.ibm.com>
+	    Luis Machado  <luisgpm@br.ibm.com>
+
+	* gdb.base/break-entry.exp: convert entry point for
+	ppc64 and expect leading `.' on ppc64's symbols
+
 2010-11-05  Doug Evans  <dje@google.com>
 
 	* gdb.base/help.exp: Update expected output.
--- src/gdb/testsuite/gdb.base/break-entry.exp	2010/04/04 22:12:14	1.1
+++ src/gdb/testsuite/gdb.base/break-entry.exp	2010/11/08 18:05:56	1.2
@@ -34,10 +34,20 @@
     return
 }
 
+if {[istarget powerpc64-*] && [is_lp64_target]} {
+    set test "convert entry point"
+    gdb_test_multiple "p *(void(*)(void) *) $entry" $test {
+	-re " =( \\(\[^0-9\]*\\))? (0x\[0-9a-f\]+)( <.*)?\r\n$gdb_prompt $" {
+	    set entry $expect_out(2,string)
+	    pass $test
+	}
+    }
+}
+
 if ![runto "*$entry"] {
     return
 }
 gdb_test {p/x $pc} " = $entry"
 
 gdb_breakpoint "main"
-gdb_continue_to_breakpoint "main" "main.*"
+gdb_continue_to_breakpoint "main" "\\.?main.*"