From f4a0f710aefbe16ed45a7c0bfd9b5ab9858d1275 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 12 Oct 2020 11:32:21 +1030 Subject: [PATCH] Re: gdb: Improve formatting of 'show architecture' messages 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. * gdb.arch/arm-disassembler-options.exp: Adjust expected "target architecture" output. * gdb.arch/powerpc-d128-regs.exp: Likewise. * gdb.arch/powerpc-disassembler-options.exp: Likewise. * gdb.arch/ppc64-symtab-cordic.exp: Likewise. * gdb.arch/s390-disassembler-options.exp: Likewise. --- gdb/testsuite/ChangeLog | 9 +++++++++ gdb/testsuite/gdb.arch/arm-disassembler-options.exp | 4 ++-- gdb/testsuite/gdb.arch/powerpc-d128-regs.exp | 2 +- gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp | 4 ++-- gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp | 4 ++-- gdb/testsuite/gdb.arch/s390-disassembler-options.exp | 4 ++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d50870105ea..59310fe08bc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2020-10-13 Alan Modra + + * gdb.arch/arm-disassembler-options.exp: Adjust expected + "target architecture" output. + * gdb.arch/powerpc-d128-regs.exp: Likewise. + * gdb.arch/powerpc-disassembler-options.exp: Likewise. + * gdb.arch/ppc64-symtab-cordic.exp: Likewise. + * gdb.arch/s390-disassembler-options.exp: Likewise. + 2020-10-12 Pedro Alves PR exp/26602 diff --git a/gdb/testsuite/gdb.arch/arm-disassembler-options.exp b/gdb/testsuite/gdb.arch/arm-disassembler-options.exp index ac1d8a8bdaa..a3c0c0e5f8b 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 e7bbccb2711..cd96029fe85 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 68d9bf61e17..9b3f8309fe8 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 fa5bff9cebf..a1fa5ffabee 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 a9ae230aa05..16e7cd18d7a 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" \ -- 2.30.2