From f3b0f7fe42309fa0e00b4d2074b0faefbf2e8ffd Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 13 Feb 2020 08:37:34 +0100 Subject: [PATCH] [gdb/testsuite] Fix gnatmake_version_at_least After de-installing gnatmake, I get: ... Running src/gdb/testsuite/gdb.ada/rename_subscript_param.exp ... ERROR: tcl error sourcing src/gdb/testsuite/gdb.ada/rename_subscript_param.exp. ERROR: couldn't execute "gnatmake": no such file or directory while executing "exec $gnatmake --version" (procedure "gnatmake_version_at_least" line 4) ... Fix this by wrapping the exec call in a catch call. Tested with and withouth gnatmake installed on x86_64-linux. gdb/testsuite/ChangeLog: 2020-02-13 Tom de Vries * lib/ada.exp (gnatmake_version_at_least): Wrap exec call in a catch call. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/ada.exp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 06826746d5..6abc56ca85 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-02-13 Tom de Vries + + * lib/ada.exp (gnatmake_version_at_least): Wrap exec call in a catch + call. + 2020-02-11 Sergio Durigan Junior PR tui/25126 diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index f8a6a723bb..726977d98f 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -136,7 +136,9 @@ proc find_ada_tool {tool} { proc gnatmake_version_at_least { major } { set gnatmake [gdb_find_gnatmake] set gnatmake [lindex [split $gnatmake] 0] - set output [exec $gnatmake --version] + if {[catch {exec $gnatmake --version} output]} { + return 0 + } if { [regexp {GNATMAKE ([^ .]+).([^ .]+).([^ .]+)} $output \ match gnatmake_major gnatmake_minor gnatmake_micro] } { if { $gnatmake_major >= $major } { -- 2.34.1