From 4747ee412af56b4becdc0a27133003889eca6395 Mon Sep 17 00:00:00 2001
From: billingd <billingd@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 14 Dec 2005 03:28:17 +0000
Subject: [PATCH] 2005-12-14  David Billinghurst 
 (David.Billinghurst@riotinto.com)

	* lib/fortran-torture.exp:  Catch remaining uses of
	remote_file build delete.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108503 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/lib/fortran-torture.exp | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 157820c..6d53230 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14  David Billinghurst  (David.Billinghurst@riotinto.com)
+
+	* lib/fortran-torture.exp:  Catch remaining uses of 
+	remote_file build delete. 
+
 2005-12-13  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* g++.old-deja/g++.oliva/stkalign.C: Remove xfail.
diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index 48f13bf..2f05ba5 100644
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -77,13 +77,13 @@ proc fortran-torture-compile { src option } {
  
     if [string match "$fatal_signal 6" $comp_output] then {
 	gfortran_fail $testcase "Got Signal 6, $option"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
     if [string match "$fatal_signal 11" $comp_output] then {
 	gfortran_fail $testcase "Got Signal 11, $option"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
@@ -92,7 +92,7 @@ proc fortran-torture-compile { src option } {
 	warning "$testcase: (with warnings) $option"
 	send_log "$comp_output\n"
 	unresolved "$testcase, $option"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
@@ -103,7 +103,7 @@ proc fortran-torture-compile { src option } {
     set unsupported_message [gfortran_check_unsupported_p $comp_output]
     if { $unsupported_message != "" } {
 	unsupported "$testcase: $unsupported_message"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
@@ -113,12 +113,12 @@ proc fortran-torture-compile { src option } {
     # If any message remains, we fail.
     if ![string match "" $comp_output] then {
 	gfortran_fail $testcase $option
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
     gfortran_pass $testcase $option
-    remote_file build delete $output
+    catch { remote_file build delete $output }
 }
 
 
@@ -195,13 +195,13 @@ proc fortran-torture-execute { src } {
 	
 	if [string match "$fatal_signal 6" $comp_output] then {
 	    gfortran_fail $testcase "Got Signal 6, $option"
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
 	    continue
 	}
 	
 	if [string match "$fatal_signal 11" $comp_output] then {
 	    gfortran_fail $testcase "Got Signal 11, $option"
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
 	    continue
 	}
 	
@@ -210,7 +210,7 @@ proc fortran-torture-execute { src } {
 	    warning "$testcase: (with warnings) $option"
 	    send_log "$comp_output\n"
 	    unresolved "$testcase, $option"
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
 	    continue
 	}
 	
@@ -265,7 +265,7 @@ proc fortran-torture-execute { src } {
 	set status [lindex $result 0]
 	set output [lindex $result 1]
         if { $status == "pass" } {
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
         }
 	$status "$testcase execution, $option"
     }
-- 
2.7.4