[powerpc] Add labels to some existing tests to fix "duplicate test" warnings.

Message ID 0e0f364d56ccd31f577aee9a67df57c6432b8cb0.camel@vnet.ibm.com
State New
Headers show
Series
  • [powerpc] Add labels to some existing tests to fix "duplicate test" warnings.
Related show

Commit Message

Keith Seitz via Gdb-patches March 27, 2021, 12:25 a.m.
Hi,
    Add labels to some existing tests to fix "duplicate test" warnings.
    
    
    This clears up a few duplicate test warnings i'm seeing when re-running
    the gdb regtests.


YYYY-MM-DD  Will Schmidt  <will_schmidt@vnet.ibm.com>

gdb/testcase/ChangeLog:
	* gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp:  Add label
          to gdb_test call for uniqueness.
	* gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp: Add label to
	  gdb_test call for uniqueness.


powerpc-disassembler-options.exp |    4 ++--
powerpc-fpscr-gcore.exp          |    4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Andrew Burgess March 27, 2021, 2:38 p.m. | #1
* will schmidt via Gdb-patches <gdb-patches@sourceware.org> [2021-03-26 19:25:11 -0500]:

> 

> Hi,

>     Add labels to some existing tests to fix "duplicate test" warnings.

>     

>     

>     This clears up a few duplicate test warnings i'm seeing when re-running

>     the gdb regtests.

> 

> 

> YYYY-MM-DD  Will Schmidt  <will_schmidt@vnet.ibm.com>

> 

> gdb/testcase/ChangeLog:

> 	* gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp:  Add label

>           to gdb_test call for uniqueness.

> 	* gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp: Add label to

> 	  gdb_test call for uniqueness.


Thanks for doing this.  I fixed some style issues in the ChangeLog and
pushed this to master.

> 

> 

> powerpc-disassembler-options.exp |    4 ++--

> powerpc-fpscr-gcore.exp          |    4 ++--

> 2 files changed, 4 insertions(+), 4 deletions(-)

> 

> 

> 

> 

> diff --git a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp

> index 765b49add0..500f87f43e 100644

> --- a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp

> +++ b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp

> @@ -40,17 +40,17 @@ gdb_test "show disassembler-options" \

>  	"show NULL disassembler-options"

>  

>  gdb_test_no_output "set disassembler-options $option"

>  gdb_test "show disassembler-options" \

>  	"The current disassembler options are '$option'.*" \

> -	"show disassembler-options $option"

> +	"show disassembler-options $option after set arch $arch1"

>  

>  # Change architectures and verify the disassembler options have been preserved.

>  

>  gdb_test "set architecture $arch2" \

>  	"The target architecture is set to \"$arch2\"\." \

>  	"set architecture $arch2"

>  

>  gdb_test "show disassembler-options" \

>  	"The current disassembler options are '$option'.*" \

> -	"show disassembler-options $option"

> +	"show disassembler-options $option after set arch $arch2"

>  

> diff --git a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp

> index da9a1b8f9f..5a72e61d34 100644

> --- a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp

> +++ b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp

> @@ -64,11 +64,11 @@ proc check_fpscr_access {} {

>  

>  if { ![check_fpscr_access] } {

>      return -1

>  }

>  

> -set fpscr_size_process [get_integer_valueof "sizeof(\$fpscr)" -1]

> +set fpscr_size_process [get_integer_valueof "sizeof(\$fpscr)" -1 "process size"]

>  

>  set core_filename [standard_output_file "$testfile.core"]

>  set core_generated [gdb_gcore_cmd "$core_filename" "generate core file"]

>  

>  if { !$core_generated } {

> @@ -81,11 +81,11 @@ set core_loaded [gdb_core_cmd "$core_filename" "load core file"]

>  

>  if { $core_loaded != 1 } {

>      return -1

>  }

>  

> -set fpscr_size_corefile [get_integer_valueof "sizeof(\$fpscr)" -2]

> +set fpscr_size_corefile [get_integer_valueof "sizeof(\$fpscr)" -2 "corefile size" ]

>  

>  set test "fpscr size matches"

>  if {$fpscr_size_process == $fpscr_size_corefile} {

>      pass $test

>  } else {

>
Keith Seitz via Gdb-patches March 29, 2021, 2:20 p.m. | #2
On Sat, 2021-03-27 at 14:38 +0000, Andrew Burgess wrote:
> * will schmidt via Gdb-patches <gdb-patches@sourceware.org> [2021-03-

> 26 19:25:11 -0500]:

> 

> > 

> > Hi,

> >     Add labels to some existing tests to fix "duplicate test"

> > warnings.

> >     

> >     

> >     This clears up a few duplicate test warnings i'm seeing when

> > re-running

> >     the gdb regtests.

> > 

> > 

> > YYYY-MM-DD  Will Schmidt  <will_schmidt@vnet.ibm.com>

> > 

> > gdb/testcase/ChangeLog:

> > 	* gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp:  Add 

> > label

> >           to gdb_test call for uniqueness.

> > 	* gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp: Add label to

> > 	  gdb_test call for uniqueness.

> 

> Thanks for doing this.  I fixed some style issues in the ChangeLog

> and

> pushed this to master.


Thanks  :-)

-Will

> 

> > 

> > 

> > powerpc-disassembler-options.exp |    4 ++--

> > powerpc-fpscr-gcore.exp          |    4 ++--

> > 2 files changed, 4 insertions(+), 4 deletions(-)

> > 

> > 

> >

Patch

diff --git a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
index 765b49add0..500f87f43e 100644
--- a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
@@ -40,17 +40,17 @@  gdb_test "show disassembler-options" \
 	"show NULL disassembler-options"
 
 gdb_test_no_output "set disassembler-options $option"
 gdb_test "show disassembler-options" \
 	"The current disassembler options are '$option'.*" \
-	"show disassembler-options $option"
+	"show disassembler-options $option after set arch $arch1"
 
 # Change architectures and verify the disassembler options have been preserved.
 
 gdb_test "set architecture $arch2" \
 	"The target architecture is set to \"$arch2\"\." \
 	"set architecture $arch2"
 
 gdb_test "show disassembler-options" \
 	"The current disassembler options are '$option'.*" \
-	"show disassembler-options $option"
+	"show disassembler-options $option after set arch $arch2"
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
index da9a1b8f9f..5a72e61d34 100644
--- a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
@@ -64,11 +64,11 @@  proc check_fpscr_access {} {
 
 if { ![check_fpscr_access] } {
     return -1
 }
 
-set fpscr_size_process [get_integer_valueof "sizeof(\$fpscr)" -1]
+set fpscr_size_process [get_integer_valueof "sizeof(\$fpscr)" -1 "process size"]
 
 set core_filename [standard_output_file "$testfile.core"]
 set core_generated [gdb_gcore_cmd "$core_filename" "generate core file"]
 
 if { !$core_generated } {
@@ -81,11 +81,11 @@  set core_loaded [gdb_core_cmd "$core_filename" "load core file"]
 
 if { $core_loaded != 1 } {
     return -1
 }
 
-set fpscr_size_corefile [get_integer_valueof "sizeof(\$fpscr)" -2]
+set fpscr_size_corefile [get_integer_valueof "sizeof(\$fpscr)" -2 "corefile size" ]
 
 set test "fpscr size matches"
 if {$fpscr_size_process == $fpscr_size_corefile} {
     pass $test
 } else {