From fa6963330dc6edccda21ca2af39bc40f9fda3094 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <uros@gcc.gnu.org>
Date: Mon, 10 Oct 2011 20:23:30 +0200
Subject: [PATCH] gcc-gdb-test.exp (gdb-test): Delete $cmd_file before return.

	* lib/gcc-gdb-test.exp (gdb-test): Delete $cmd_file before return.

From-SVN: r179767
---
 gcc/testsuite/ChangeLog              | 11 ++++++++---
 gcc/testsuite/g++.dg/other/pr47218.C |  2 +-
 gcc/testsuite/lib/gcc-gdb-test.exp   |  7 ++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f5decfd0446..7d5a1f45394 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,9 +1,13 @@
+2011-10-10  Uros Bizjak  <ubizjak@gmail.com>
+
+	* lib/gcc-gdb-test.exp (gdb-test): Delete $cmd_file before return.
+
 2011-10-10  Janis Johnson  <janisjo@codesourcery.com>
 
 	* gcc.dg/graphite/id-pr46845.c: Include powerpc for warning options.
 
 2011-10-10  Kirill Yukhin  <kirill.yukhin@intel.com>
-	    Yakovlev Vladimir <vladimir.b.yakovlev@intel.com>
+	    Yakovlev Vladimir  <vladimir.b.yakovlev@intel.com>
 
 	* gcc.target/i386/fma_1.h: New file.
 	* gcc.target/i386/fma_2.h: Likewise.
@@ -178,7 +182,7 @@
 	PR fortran/50625
 	* gfortran.dg/class_46.f03: New.
 
-2011-10-06  Joern Rennecke <joern.rennecke@embecosm.com>
+2011-10-06  Joern Rennecke  <joern.rennecke@embecosm.com>
 
 	* gcc.dg/pr47276.c (ASMNAME, ASMNAME2, STRING): Define.
 	(__EI___vsyslog_chk, __EI_syslog, __EI_vsyslog): Use ASMNAME.
@@ -6443,6 +6447,7 @@
 	* gcc.dg/vect/pr49038.c: New test.
 
 2011-05-26  Fabien Chêne  <fabien@gcc.gnu.org>
+
 	* g++.dg/init/pr25811-3.C: New.
 	* g++.dg/init/pr25811-4.C: New.
 
@@ -6517,7 +6522,7 @@
 2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	PR libobjc/48177
-	* objc.dg/pr48177.m: New testcase.	
+	* objc.dg/pr48177.m: New testcase.
 
 2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>
 
diff --git a/gcc/testsuite/g++.dg/other/pr47218.C b/gcc/testsuite/g++.dg/other/pr47218.C
index f94e15742eb..57245c036b2 100644
--- a/gcc/testsuite/g++.dg/other/pr47218.C
+++ b/gcc/testsuite/g++.dg/other/pr47218.C
@@ -18,4 +18,4 @@ int main ()
   return 0;
 }
 
-// { dg-final cleanup-saved-temps }
+// { dg-final { cleanup-saved-temps } }
diff --git a/gcc/testsuite/lib/gcc-gdb-test.exp b/gcc/testsuite/lib/gcc-gdb-test.exp
index 22e7a491873..2f593ab2edf 100644
--- a/gcc/testsuite/lib/gcc-gdb-test.exp
+++ b/gcc/testsuite/lib/gcc-gdb-test.exp
@@ -56,6 +56,7 @@ proc gdb-test { args } {
     set res [remote_spawn target "$gdb_name -nx -nw -quiet -x $cmd_file ./$output_file"]
     if { $res < 0 || $res == "" } {
 	unsupported "$testname"
+	file delete $cmd_file
 	return
     }
 
@@ -64,6 +65,7 @@ proc gdb-test { args } {
 	-re "Unhandled dwarf expression|Error in sourced command file" {
 	    unsupported "$testname"
 	    remote_close target
+	    file delete $cmd_file
 	    return
 	}
 	-re {[\n\r]\$1 = ([^\n\r]*)[\n\r]+\$2 = ([^\n\r]*)[\n\r]} {
@@ -76,16 +78,19 @@ proc gdb-test { args } {
 		fail "$testname"
 	    }
 	    remote_close target
+	    file delete $cmd_file
 	    return
 	}
 	timeout {
 	    unsupported "$testname"
 	    remote_close target
+	    file delete $cmd_file
 	    return
 	}
     }
 
-    remote_close target
     unsupported "$testname"
+    remote_close target
+    file delete $cmd_file
     return
 }
-- 
2.30.2