diff options
| author | Ben Elliston <bje@gnu.org> | 2011-04-12 19:22:45 +1000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2011-04-12 19:34:50 +1000 |
| commit | 55a770e7c6897d521d4ba7995ac60ec72b0c50b4 (patch) | |
| tree | de3f6780ddf30a3d835e56ac4cc2d7e515583cd8 | |
| parent | 126a089777158a7891ff975473939f08c0e31a1c (diff) | |
| download | dejagnu-55a770e7c6897d521d4ba7995ac60ec72b0c50b4.zip dejagnu-55a770e7c6897d521d4ba7995ac60ec72b0c50b4.tar.gz dejagnu-55a770e7c6897d521d4ba7995ac60ec72b0c50b4.tar.bz2 | |
* 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.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | config/netware.exp | 3 | ||||
| -rw-r--r-- | config/vxworks.exp | 2 | ||||
| -rw-r--r-- | lib/dg.exp | 2 | ||||
| -rw-r--r-- | lib/framework.exp | 6 | ||||
| -rw-r--r-- | lib/remote.exp | 2 | ||||
| -rw-r--r-- | runtest.exp | 2 | ||||
| -rw-r--r-- | testsuite/runtest.all/options.exp | 4 |
8 files changed, 21 insertions, 11 deletions
@@ -1,3 +1,14 @@ +2011-04-12 Ben Elliston <bje@gnu.org> + + * 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. + 2011-03-15 Ben Elliston <bje@gnu.org> * runtest.exp: Whitespace cleanups. diff --git a/config/netware.exp b/config/netware.exp index a78faa9..6c0866e 100644 --- a/config/netware.exp +++ b/config/netware.exp @@ -199,8 +199,7 @@ proc ${board}_load { dest prog args } { -i $shell_id -re "$shell_prompt" {} } - catch [exec rm -f $lnk] - catch [exec rm -f $nlm] + catch [file delete -force -- $lnk $nlm] if { $ret == 0 } { return "pass" diff --git a/config/vxworks.exp b/config/vxworks.exp index 367c445..6f9a888 100644 --- a/config/vxworks.exp +++ b/config/vxworks.exp @@ -188,7 +188,7 @@ proc vxworks_file { dest op args } { foreach x $args { set x "${dir}/[file tail $x]" if { [file exists $x] && [file isfile $x] } { - exec rm -f $x + file delete -force -- $x } } return @@ -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 diff --git a/runtest.exp b/runtest.exp index da9b978..4bfed83 100644 --- a/runtest.exp +++ b/runtest.exp @@ -1063,7 +1063,7 @@ for { set i 0 } { $i < $argc } { incr i } { "--de*" { # (--debug) expect internal debugging if {[file exists ./dbg.log]} { - catch "exec rm -f ./dbg.log" + catch [file delete -force -- dbg.log" } if { $verbose > 2 } { exp_internal -f dbg.log 1 diff --git a/testsuite/runtest.all/options.exp b/testsuite/runtest.all/options.exp index 7dd8d7e..3d3a9c2 100644 --- a/testsuite/runtest.all/options.exp +++ b/testsuite/runtest.all/options.exp @@ -84,10 +84,10 @@ close $fd # clean up log files left by the child runtest if [file exists $objdir/x.sum] { - exec rm -f $objdir/x.* + file delete [glob $objdir/x.*] } if [file exists $objdir/xXx.sum] { - exec rm -f $objdir/xXx.* + file delete [glob $objdir/xXx.*] } if [file exists dbg.log] { file delete dbg.log |