diff options
| author | Tom de Vries <tdevries@suse.de> | 2018-06-23 23:41:51 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2018-06-23 23:41:51 +0000 |
| commit | bf515867780e3e7d38576ef4e6102a1f3a417ded (patch) | |
| tree | b0b9c676fc64c864bb5f051800eaef1bfdff0fee /gcc | |
| parent | be68f3fa0f47e42f436a574e733ea709a83c6312 (diff) | |
| download | gcc-bf515867780e3e7d38576ef4e6102a1f3a417ded.zip gcc-bf515867780e3e7d38576ef4e6102a1f3a417ded.tar.gz gcc-bf515867780e3e7d38576ef4e6102a1f3a417ded.tar.bz2 | |
[testsuite/guality] Fix tcl error on missing gdb
2018-06-24 Tom de Vries <tdevries@suse.de>
* g++.dg/guality/guality.exp: Don't use which on gdb arg to report_gdb.
* gcc.dg/guality/guality.exp: Same.
* gfortran.dg/guality/guality.exp: Same.
* lib/gcc-gdb-test.exp: Do early out if which gdb fails.
From-SVN: r261988
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/guality/guality.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/guality/guality.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/guality/guality.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gcc-gdb-test.exp | 5 |
5 files changed, 15 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 01218b3..5ff08f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-06-24 Tom de Vries <tdevries@suse.de> + + * g++.dg/guality/guality.exp: Don't use which on gdb arg to report_gdb. + * gcc.dg/guality/guality.exp: Same. + * gfortran.dg/guality/guality.exp: Same. + * lib/gcc-gdb-test.exp: Do early out if which gdb fails. + 2018-06-23 Paolo Carlini <paolo.carlini@oracle.com> * g++.dg/concepts/locations1.C: New. diff --git a/gcc/testsuite/g++.dg/guality/guality.exp b/gcc/testsuite/g++.dg/guality/guality.exp index e5eacee..4be22ba 100644 --- a/gcc/testsuite/g++.dg/guality/guality.exp +++ b/gcc/testsuite/g++.dg/guality/guality.exp @@ -46,7 +46,7 @@ if ![info exists ::env(GUALITY_GDB_NAME)] { } setenv GUALITY_GDB_NAME "$guality_gdb_name" } -report_gdb [exec which $::env(GUALITY_GDB_NAME)] [info script] +report_gdb $::env(GUALITY_GDB_NAME) [info script] if {[check_guality " #include \"$srcdir/$subdir/guality.h\" diff --git a/gcc/testsuite/gcc.dg/guality/guality.exp b/gcc/testsuite/gcc.dg/guality/guality.exp index 2a90ec3..04e889c 100644 --- a/gcc/testsuite/gcc.dg/guality/guality.exp +++ b/gcc/testsuite/gcc.dg/guality/guality.exp @@ -46,7 +46,7 @@ if ![info exists ::env(GUALITY_GDB_NAME)] { } setenv GUALITY_GDB_NAME "$guality_gdb_name" } -report_gdb [exec which $::env(GUALITY_GDB_NAME)] [info script] +report_gdb $::env(GUALITY_GDB_NAME) [info script] if {[check_guality " #include \"$srcdir/$subdir/guality.h\" diff --git a/gcc/testsuite/gfortran.dg/guality/guality.exp b/gcc/testsuite/gfortran.dg/guality/guality.exp index 3784cac..f76347d 100644 --- a/gcc/testsuite/gfortran.dg/guality/guality.exp +++ b/gcc/testsuite/gfortran.dg/guality/guality.exp @@ -27,7 +27,7 @@ if ![info exists ::env(GUALITY_GDB_NAME)] { } setenv GUALITY_GDB_NAME "$guality_gdb_name" } -report_gdb [exec which $::env(GUALITY_GDB_NAME)] [info script] +report_gdb $::env(GUALITY_GDB_NAME) [info script] gfortran-dg-runtest [lsort [glob $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ]] "" "" diff --git a/gcc/testsuite/lib/gcc-gdb-test.exp b/gcc/testsuite/lib/gcc-gdb-test.exp index f372663..9aff621 100644 --- a/gcc/testsuite/lib/gcc-gdb-test.exp +++ b/gcc/testsuite/lib/gcc-gdb-test.exp @@ -145,6 +145,11 @@ proc gdb-test { args } { # Argument 1 is the location where gdb is used # proc report_gdb { gdb loc } { + if { [catch { exec which $gdb } msg] } { + send_log "gdb not found in $loc: $msg\n" + return + } + 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" |