From f90fd8c2f17c7631915103ce5b760830a156ee93 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 20 Oct 2016 21:58:54 +0200 Subject: [PATCH] testsuite: Fix gcc_compiled for gcc 6 & 7 gdb/testsuite/ChangeLog 2016-10-20 Jan Kratochvil * lib/gdb.exp (get_compiler_info): Generalize gcc_compile regexp. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/lib/gdb.exp | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 54095373dc..c8709b7565 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2016-10-20 Jan Kratochvil + + * lib/gdb.exp (get_compiler_info): Generalize gcc_compile regexp. + 2016-10-19 Maciej W. Rozycki * gdb.base/killed-outside.exp: Remove $options from a call to diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 378eea04ce..7d9b198643 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3290,12 +3290,8 @@ proc get_compiler_info {{arg ""}} { } # Set the legacy symbols. - set gcc_compiled 0 - if { [regexp "^gcc-1-" "$compiler_info" ] } { set gcc_compiled 1 } - if { [regexp "^gcc-2-" "$compiler_info" ] } { set gcc_compiled 2 } - if { [regexp "^gcc-3-" "$compiler_info" ] } { set gcc_compiled 3 } - if { [regexp "^gcc-4-" "$compiler_info" ] } { set gcc_compiled 4 } - if { [regexp "^gcc-5-" "$compiler_info" ] } { set gcc_compiled 5 } + set gcc_compiled 0 + regexp "^gcc-(\[0-9\]+)-" "$compiler_info" matchall gcc_compiled # Log what happened. verbose -log "get_compiler_info: $compiler_info" -- 2.34.1