gdb/testsuite: Remove use of dejagnu cleanup proc

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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0251584448ba1e562b8be9ef42b1093590b6660a..0af50b0498adb5f191f6fbc2cf20bb379c9f8ca2 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-03  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * config/sid.exp (gdb_target_sid): Remove use of cleanup.
+       * config/sim.exp (gdb_target_sim): Remove use of cleanup.
+
 2018-02-01  Simon Marchi  <simon.marchi@polymtl.ca>
            Leszek Swirski  <leszeks@google.com>
 

diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp
index 36bd8611966afa4578d4bed3bd48e163f206939c..8ff0263b6183c272f15363281d4da5ec2551232a 100644 (file)
--- 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 7170a259837b2745b01e23b8aa5c26855ca1d7d2..d9072febc6a7029bdff97e3132e2ea33ffa2334b 100644 (file)
--- 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
        }
     }