From: Tom de Vries <tdevries@suse.de>
Date: Mon, 25 Jun 2018 15:56:13 +0000 (+0000)
Subject: [testsuite/guality] Fix tcl error on gdb -v failure
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e85d88526441a9d936a71015f00482abcea3d9f;p=gcc.git

[testsuite/guality] Fix tcl error on gdb -v failure

2018-06-25  Tom de Vries  <tdevries@suse.de>

	* lib/gcc-gdb-test.exp (report_gdb): Handle gdb -v failure.

From-SVN: r262021
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0d3cb5fee7a..f9912f06452 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-25  Tom de Vries  <tdevries@suse.de>
+
+	* lib/gcc-gdb-test.exp (report_gdb): Handle gdb -v failure.
+
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/84786
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"
 }