diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2016-10-20 21:58:54 +0200 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2016-10-20 21:58:54 +0200 |
| commit | f90fd8c2f17c7631915103ce5b760830a156ee93 (patch) | |
| tree | 988c31bd6ed90203ccf4f6ba4171d79843be09f6 | |
| parent | 789b4e00353f554c69ded290564276742ee290db (diff) | |
| download | gdb-f90fd8c2f17c7631915103ce5b760830a156ee93.zip gdb-f90fd8c2f17c7631915103ce5b760830a156ee93.tar.gz gdb-f90fd8c2f17c7631915103ce5b760830a156ee93.tar.bz2 | |
testsuite: Fix gcc_compiled for gcc 6 & 7
gdb/testsuite/ChangeLog
2016-10-20 Jan Kratochvil <jan.kratochvil@redhat.com>
* lib/gdb.exp (get_compiler_info): Generalize gcc_compile regexp.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5409537..c8709b7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2016-10-20 Jan Kratochvil <jan.kratochvil@redhat.com> + + * lib/gdb.exp (get_compiler_info): Generalize gcc_compile regexp. + 2016-10-19 Maciej W. Rozycki <macro@imgtec.com> * 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 378eea0..7d9b198 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" |