* config/vxworks.exp (vxworks_file): Use "file delete", not "exec

	rm", for better portability.
	* config/netware.exp (${board}_load): Likewise.
	* lib/dg.exp (dg-test): Likewise.
	* lib/framework.exp (open_logs): Likewise.
	* lib/remote.exp (standard_file): Likewise.
	* runtest.exp: Likewise.
	* testsuite/runtest.all/options.exp: Likewise.

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/dg.exp b/lib/dg.exp
index 081644e..889585f 100644
--- a/lib/dg.exp
+++ b/lib/dg.exp
@@ -897,7 +897,7 @@ proc dg-test { args } {
     # When testing an interpreter, we don't compile something and leave an
     # output file.
     if { ! ${keep} && ${dg-interpreter-batch-mode} == 0 } {
-	catch "exec rm -f $output_file"
+	catch "file delete -force -- $output_file"
     }
 }
 
diff --git a/lib/framework.exp b/lib/framework.exp
index e8cd7f9..5871ecc 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -70,16 +70,16 @@ proc open_logs { } {
     if { ${tool} ==  "" } {
 	set tool testrun
     }
-    catch "exec rm -f $outdir/$tool.sum"
+    catch "file delete -force -- $outdir/$tool.sum"
     set sum_file [open [file join $outdir $tool.sum] w]
     if { $xml } {
-	catch "exec rm -f $outdir/$tool.xml"
+	catch "file delete -force -- $outdir/$tool.xml"
 	set xml_file [open [file join $outdir $tool.xml] w]
 	xml_output "<?xml version=\"1.0\"?>"
 	insertdtd
 	xml_output "<testsuite>"
     }
-    catch "exec rm -f $outdir/$tool.log"
+    catch "file delete -force -- $outdir/$tool.log"
     log_file -a "$outdir/$tool.log"
     verbose "Opening log files in $outdir"
     if { ${tool} ==  "testrun" } {
diff --git a/lib/remote.exp b/lib/remote.exp
index 966e167..5cfe43a 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -709,7 +709,7 @@ proc standard_file { dest op args } {
 	    delete {
 		foreach x $args {
 		    if { [file exists $x] && [file isfile $x] } {
-			exec rm -f $x
+			file delete -force -- $x
 		    }
 		}
 		return