From 042480556d18b47e32e18da726187fc9aa69911f Mon Sep 17 00:00:00 2001 From: Chris Demetriou Date: Wed, 8 Oct 2003 18:01:10 +0000 Subject: [PATCH] 2003-10-08 Chris Demetriou * lib/gas-defs.exp (gas_run): Always log the command being run. (gas_start): Likewise. (regexp_diff): Make error reporting about non-existent files consistent. --- gas/testsuite/ChangeLog | 7 +++++++ gas/testsuite/lib/gas-defs.exp | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 32194adc80e..24933495615 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2003-10-08 Chris Demetriou + + * lib/gas-defs.exp (gas_run): Always log the command being run. + (gas_start): Likewise. + (regexp_diff): Make error reporting about non-existent files + consistent. + 2003-10-06 Nick Clifton * gas/macros/app1.d: Skip sections symbols (if present). diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp index 682987defe7..8116934d898 100644 --- a/gas/testsuite/lib/gas-defs.exp +++ b/gas/testsuite/lib/gas-defs.exp @@ -41,7 +41,7 @@ proc gas_run { prog as_opts redir } { global subdir global host_triplet - verbose "Executing $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog $redir" + verbose -log "Executing $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog $redir" catch "exec $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog $redir" comp_output set comp_output [prune_warnings $comp_output] verbose "output was $comp_output" @@ -60,7 +60,7 @@ proc gas_start { prog as_opts } { global subdir global spawn_id - verbose "Starting $AS $ASFLAGS $as_opts $prog" 2 + verbose -log "Starting $AS $ASFLAGS $as_opts $prog" 2 catch { spawn -noecho -nottycopy $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog } foo @@ -583,14 +583,14 @@ proc regexp_diff { file_1 file_2 } { if [file exists $file_1] then { set file_a [open $file_1 r] } else { - warning "$file_1 doesn't exist" + perror "$file_1 doesn't exist" return 1 } if [file exists $file_2] then { set file_b [open $file_2 r] } else { - fail "$file_2 doesn't exist" + perror "$file_2 doesn't exist" close $file_a return 1 } -- 2.30.2