Patchwork gdb/testsuite: Remove use of dejagnu cleanup proc

login
register
mail settings
Submitter Andrew Burgess
Date Feb. 2, 2018, 12:56 p.m.
Message ID <20180202125638.7365-1-andrew.burgess@embecosm.com>
Download mbox | patch
Permalink /patch/25765/
State New
Headers show

Comments

Andrew Burgess - Feb. 2, 2018, 12:56 p.m.
The 'cleanup' proc has been removed from dejagnu (Feb 15 2016).  The
proc has not done anything useful since at least 2001 so removing
these calls should be harmless.

gdb/testsuite/ChangeLog:

	* config/sid.exp (gdb_target_sid): Remove use of cleanup.
	* config/sim.exp (gdb_target_sim): Remove use of cleanup.
---
 gdb/testsuite/ChangeLog      | 5 +++++
 gdb/testsuite/config/sid.exp | 2 --
 gdb/testsuite/config/sim.exp | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)
Simon Marchi - Feb. 3, 2018, 4:59 a.m.
On 2018-02-02 07:56, Andrew Burgess wrote:
> The 'cleanup' proc has been removed from dejagnu (Feb 15 2016).  The
> proc has not done anything useful since at least 2001 so removing
> these calls should be harmless.
> 
> gdb/testsuite/ChangeLog:
> 
> 	* config/sid.exp (gdb_target_sid): Remove use of cleanup.
> 	* config/sim.exp (gdb_target_sim): Remove use of cleanup.
> ---
>  gdb/testsuite/ChangeLog      | 5 +++++
>  gdb/testsuite/config/sid.exp | 2 --
>  gdb/testsuite/config/sim.exp | 1 -
>  3 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/gdb/testsuite/config/sid.exp 
> b/gdb/testsuite/config/sid.exp
> index 36bd8611966..8ff0263b618 100644
> --- a/gdb/testsuite/config/sid.exp
> +++ b/gdb/testsuite/config/sid.exp
> @@ -146,7 +146,6 @@ proc gdb_target_sid { } {
>      gdb_expect {
>  	-re ".*\[Ee\]rror.*$gdb_prompt $" {
>  	    perror "Couldn't set target for remote simulator."
> -	    cleanup
>  	    gdb_exit
>  	}
>  	-re "Remote debugging using.*$gdb_prompt"	{
> @@ -154,7 +153,6 @@ proc gdb_target_sid { } {
>  	}
>  	timeout {
>  	    perror "Couldn't set target for remote simulator."
> -	    cleanup
>  	    gdb_exit
>  	}
>      }
> diff --git a/gdb/testsuite/config/sim.exp 
> b/gdb/testsuite/config/sim.exp
> index 7170a259837..d9072febc6a 100644
> --- a/gdb/testsuite/config/sim.exp
> +++ b/gdb/testsuite/config/sim.exp
> @@ -34,7 +34,6 @@ proc gdb_target_sim { } {
>  	}
>  	timeout {
>  	    perror "Couldn't set target for simulator."
> -	    cleanup
>  	    return -1
>  	}
>      }

LGTM.

I guess with a recent Dejagnu it would produce an error to try to run it 
then?

Simon
Andrew Burgess - Feb. 3, 2018, 4:53 p.m.
* Simon Marchi <simon.marchi@polymtl.ca> [2018-02-02 23:59:07 -0500]:

> On 2018-02-02 07:56, Andrew Burgess wrote:
> > The 'cleanup' proc has been removed from dejagnu (Feb 15 2016).  The
> > proc has not done anything useful since at least 2001 so removing
> > these calls should be harmless.
> > 
> > gdb/testsuite/ChangeLog:
> > 
> > 	* config/sid.exp (gdb_target_sid): Remove use of cleanup.
> > 	* config/sim.exp (gdb_target_sim): Remove use of cleanup.
> > ---
> >  gdb/testsuite/ChangeLog      | 5 +++++
> >  gdb/testsuite/config/sid.exp | 2 --
> >  gdb/testsuite/config/sim.exp | 1 -
> >  3 files changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp
> > index 36bd8611966..8ff0263b618 100644
> > --- a/gdb/testsuite/config/sid.exp
> > +++ b/gdb/testsuite/config/sid.exp
> > @@ -146,7 +146,6 @@ proc gdb_target_sid { } {
> >      gdb_expect {
> >  	-re ".*\[Ee\]rror.*$gdb_prompt $" {
> >  	    perror "Couldn't set target for remote simulator."
> > -	    cleanup
> >  	    gdb_exit
> >  	}
> >  	-re "Remote debugging using.*$gdb_prompt"	{
> > @@ -154,7 +153,6 @@ proc gdb_target_sid { } {
> >  	}
> >  	timeout {
> >  	    perror "Couldn't set target for remote simulator."
> > -	    cleanup
> >  	    gdb_exit
> >  	}
> >      }
> > diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp
> > index 7170a259837..d9072febc6a 100644
> > --- a/gdb/testsuite/config/sim.exp
> > +++ b/gdb/testsuite/config/sim.exp
> > @@ -34,7 +34,6 @@ proc gdb_target_sim { } {
> >  	}
> >  	timeout {
> >  	    perror "Couldn't set target for simulator."
> > -	    cleanup
> >  	    return -1
> >  	}
> >      }
> 
> LGTM.
> 
> I guess with a recent Dejagnu it would produce an error to try to run it
> then?

Well, all the uses are on error paths, so, you're fine unless you're
failing... then you crash rather than simply failing one test and
continuing.

I'll go ahead and push this in.

Thanks,
Andrew

Patch

diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp
index 36bd8611966..8ff0263b618 100644
--- a/gdb/testsuite/config/sid.exp
+++ b/gdb/testsuite/config/sid.exp
@@ -146,7 +146,6 @@  proc gdb_target_sid { } {
     gdb_expect {
 	-re ".*\[Ee\]rror.*$gdb_prompt $" {
 	    perror "Couldn't set target for remote simulator."
-	    cleanup
 	    gdb_exit
 	}
 	-re "Remote debugging using.*$gdb_prompt"	{
@@ -154,7 +153,6 @@  proc gdb_target_sid { } {
 	}
 	timeout { 
 	    perror "Couldn't set target for remote simulator."
-	    cleanup
 	    gdb_exit
 	}
     }
diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp
index 7170a259837..d9072febc6a 100644
--- a/gdb/testsuite/config/sim.exp
+++ b/gdb/testsuite/config/sim.exp
@@ -34,7 +34,6 @@  proc gdb_target_sim { } {
 	}
 	timeout { 
 	    perror "Couldn't set target for simulator."
-	    cleanup
 	    return -1
 	}
     }