diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/rename_subscript_param.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/lib/ada.exp | 19 |
3 files changed, 29 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 395a257..d04cff1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-09-14 Tom de Vries <tdevries@suse.de> + + PR teststuite/24599 + * gdb.ada/rename_subscript_param.exp: Require gnatmake 8. + * lib/ada.exp (gnatmake_version_at_least): New proc. + 2019-09-12 Andrew Burgess <andrew.burgess@embecosm.com> * gdb.base/maint.exp: Use exec_has_index_section. diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp index ffcfa50..fd82088 100644 --- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp +++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp @@ -15,6 +15,10 @@ load_lib "ada.exp" +if { ![gnatmake_version_at_least 8] } { + return -1 +} + standard_ada_testfile pb30_012 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 1345c74..95f0f52 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -105,3 +105,22 @@ proc find_ada_tool {tool} { return $result } + +# Return 1 if gnatmake is at least version $MAJOR.x.x + +proc gnatmake_version_at_least { major } { + set gnatmake [gdb_find_gnatmake] + set gnatmake [lindex [split $gnatmake] 0] + set output [exec $gnatmake --version] + if { [regexp {GNATMAKE ([^ .]+).([^ .]+).([^ .]+)} $output \ + match gnatmake_major gnatmake_minor gnatmake_micro] } { + if { $gnatmake_major >= $major } { + return 1 + } else { + return 0 + } + } + + # Unknown, return 1 + return 1 +} |