On 06/25/2018 04:36 PM, Andreas Schwab wrote: > On Jun 25 2018, Tom de Vries <tdevr...@suse.de> wrote: > >> @@ -151,6 +151,9 @@ proc report_gdb { gdb loc } { >> } >> set gdb [exec which $gdb] >> send_log "gdb used in $loc: $gdb\n" >> - set gdb_version [exec $gdb -v] >> + if { [catch { set gdb_version [exec $gdb -v] }] } { >> + send_log "gdb used in $loc: getting version failed\n" >> + return >> + } >> send_log "gdb used in $loc: version:\n---\n$gdb_version\n---\n" >> } > > How about this instead: > > diff --git a/gcc/testsuite/lib/gcc-gdb-test.exp > b/gcc/testsuite/lib/gcc-gdb-test.exp > index 9aff6218300..26fb7cd2f4d 100644 > --- a/gcc/testsuite/lib/gcc-gdb-test.exp > +++ b/gcc/testsuite/lib/gcc-gdb-test.exp > @@ -151,6 +151,6 @@ proc report_gdb { gdb loc } { > } > set gdb [exec which $gdb] > send_log "gdb used in $loc: $gdb\n" > - set gdb_version [exec $gdb -v] > + catch { exec $gdb -v } gdb_version > send_log "gdb used in $loc: version:\n---\n$gdb_version\n---\n" > }
Hmm, eliminating the set in the catch body is a good idea. But I want to start with a note that running gdb -v failed. Committed as attached. Thanks, - Tom
[testsuite/guality] Fix tcl error on gdb -v failure 2018-06-25 Tom de Vries <tdevr...@suse.de> * lib/gcc-gdb-test.exp (report_gdb): Handle gdb -v failure. --- gcc/testsuite/lib/gcc-gdb-test.exp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/lib/gcc-gdb-test.exp b/gcc/testsuite/lib/gcc-gdb-test.exp index 9aff6218300..2ef9ca15c12 100644 --- a/gcc/testsuite/lib/gcc-gdb-test.exp +++ b/gcc/testsuite/lib/gcc-gdb-test.exp @@ -151,6 +151,12 @@ proc report_gdb { gdb loc } { } set gdb [exec which $gdb] send_log "gdb used in $loc: $gdb\n" - set gdb_version [exec $gdb -v] - send_log "gdb used in $loc: version:\n---\n$gdb_version\n---\n" + + send_log "gdb used in $loc: " + if { [catch { exec $gdb -v } gdb_version] } { + send_log "getting version failed:\n" + } else { + send_log "version:\n" + } + send_log -- "---\n$gdb_version\n---\n" }