From: Andrew Burgess <andrew.burgess@embecosm.com>
To: Alan Modra <amodra@gmail.com>
Cc: gdb-patches@sourceware.org
Subject: Re: gdb: Improve formatting of 'show architecture' messages
Date: Mon, 12 Oct 2020 15:30:49 +0100 [thread overview]
Message-ID: <20201012143049.GT605036@embecosm.com> (raw)
In-Reply-To: <20201012074604.GJ19404@bubble.grove.modra.org>
* Alan Modra via Gdb-patches <gdb-patches@sourceware.org> [2020-10-12 18:16:05 +1030]:
> Commit ccb9eba6a25 updated the testsuite for some targets without
> running the testsuite on those targets. This patch corrects the
> update, in most cases just adding the expected full-stop.
>
> On powerpc64le-linux, fixes these:
> FAIL: gdb.arch/powerpc-d128-regs.exp: checking for PPC arch
> FAIL: gdb.arch/powerpc-disassembler-options.exp: set architecture powerpc:common64
> FAIL: gdb.arch/powerpc-disassembler-options.exp: set architecture rs6000:6000
> FAIL: gdb.arch/ppc64-symtab-cordic.exp: show architecture
>
> I also verified that arm-linuxeabi and s390x-linux cross-builds now
> pass their disassembler-options.exp tests.
>
> OK to apply?
>
> * testsuite/gdb.arch/arm-disassembler-options.exp: Adjust expected
> "target architecture" output.
> * testsuite/gdb.arch/powerpc-d128-regs.exp: Likewise.
> * testsuite/gdb.arch/powerpc-disassembler-options.exp: Likewise.
> * testsuite/gdb.arch/ppc64-symtab-cordic.exp: Likewise.
> * testsuite/gdb.arch/s390-disassembler-options.exp: Likewise.
Remember these entries should be in gdb/testsuite/ChangeLog, and
should not have 'testsuite/' at the start.
Thanks,
Andrew
>
> diff --git a/gdb/testsuite/gdb.arch/arm-disassembler-options.exp b/gdb/testsuite/gdb.arch/arm-disassembler-options.exp
> index ac1d8a8bda..a3c0c0e5f8 100644
> --- a/gdb/testsuite/gdb.arch/arm-disassembler-options.exp
> +++ b/gdb/testsuite/gdb.arch/arm-disassembler-options.exp
> @@ -31,7 +31,7 @@ set arch1 "armv2"
> set arch2 "armv5"
>
> gdb_test "set architecture $arch1" \
> - "The target architecture is set to \"$arch1\"" \
> + "The target architecture is set to \"$arch1\"\." \
> "set architecture $arch1"
>
> gdb_test_no_output "set disassembler-options"
> @@ -47,7 +47,7 @@ gdb_test "show disassembler-options" \
> # Change architectures and verify the disassembler options have been preserved.
>
> gdb_test "set architecture $arch2" \
> - "The target architecture is set to \"$arch2\"" \
> + "The target architecture is set to \"$arch2\"\." \
> "set architecture $arch2"
>
> gdb_test "show disassembler-options" \
> diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
> index e7bbccb271..cd96029fe8 100644
> --- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
> +++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
> @@ -44,7 +44,7 @@ if { ![runto main] } then {
> return
> }
>
> -if [gdb_test "show arch" ".*currently powerpc:common.*" "checking for PPC arch"] {
> +if [gdb_test "show arch" ".*powerpc:common.*" "checking for PPC arch"] {
> return -1
> }
>
> diff --git a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
> index 68d9bf61e1..9b3f8309fe 100644
> --- a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
> +++ b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
> @@ -31,7 +31,7 @@ set arch1 "rs6000:6000"
> set arch2 "powerpc:common64"
>
> gdb_test "set architecture $arch1" \
> - "The target architecture is set to \"$arch1\"" \
> + "The target architecture is set to \"$arch1\"\." \
> "set architecture $arch1"
>
> gdb_test_no_output "set disassembler-options"
> @@ -47,7 +47,7 @@ gdb_test "show disassembler-options" \
> # Change architectures and verify the disassembler options have been preserved.
>
> gdb_test "set architecture $arch2" \
> - "The target architecture is set to \"$arch2\"" \
> + "The target architecture is set to \"$arch2\"\." \
> "set architecture $arch2"
>
> gdb_test "show disassembler-options" \
> diff --git a/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp b/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp
> index fa5bff9ceb..a1fa5ffabe 100644
> --- a/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp
> +++ b/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp
> @@ -47,10 +47,10 @@ gdb_load ${kofile}
>
> set test "show architecture"
> gdb_test_multiple $test $test {
> - -re "\r\nThe target architecture is set to \"auto\" \\(currently \"powerpc:common64\"\\)\r\n$gdb_prompt $" {
> + -re "\r\nThe target architecture is set to \"auto\" \\(currently \"powerpc:common64\"\\)\.\r\n$gdb_prompt $" {
> pass $test
> }
> - -re "\r\nThe target architecture is set to \"auto\" \\(currently \".*\"\\)\r\n$gdb_prompt $" {
> + -re "\r\nThe target architecture is set to \"auto\" \\(currently \".*\"\\)\.\r\n$gdb_prompt $" {
> untested "powerpc:common64 is not supported"
> }
> }
> diff --git a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp
> index a9ae230aa0..16e7cd18d7 100644
> --- a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp
> +++ b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp
> @@ -31,7 +31,7 @@ set arch1 "s390:64-bit"
> set arch2 "s390:31-bit"
>
> gdb_test "set architecture $arch1" \
> - "The target architecture is set to \"$arch1\"" \
> + "The target architecture is set to \"$arch1\"\." \
> "set architecture $arch1"
>
> gdb_test_no_output "set disassembler-options"
> @@ -47,7 +47,7 @@ gdb_test "show disassembler-options" \
> # Change architectures and verify the disassembler options have been preserved.
>
> gdb_test "set architecture $arch2" \
> - "The target architecture is set to \"$arch2\"" \
> + "The target architecture is set to \"$arch2\"\." \
> "set architecture $arch2"
>
> gdb_test "show disassembler-options" \
>
> --
> Alan Modra
> Australia Development Lab, IBM
next prev parent reply other threads:[~2020-10-12 14:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 7:46 Alan Modra via Gdb-patches
2020-10-12 13:53 ` Tom Tromey
2020-10-12 14:30 ` Andrew Burgess [this message]
2020-10-12 22:11 ` Alan Modra via Gdb-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201012143049.GT605036@embecosm.com \
--to=andrew.burgess@embecosm.com \
--cc=amodra@gmail.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox