diff options
| author | Tom de Vries <tdevries@suse.de> | 2019-07-29 16:24:57 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2019-07-29 16:24:57 +0200 |
| commit | 507dd60e28d0ef35ffb7c0880933d6b88cc3f5bd (patch) | |
| tree | 7b22110612e799c2f3f15c82d77c6e9d40b2d292 /gdb | |
| parent | 5beafce944b6b200d1fa80d7f4a8656cb2ecf2fa (diff) | |
| download | gdb-507dd60e28d0ef35ffb7c0880933d6b88cc3f5bd.zip gdb-507dd60e28d0ef35ffb7c0880933d6b88cc3f5bd.tar.gz gdb-507dd60e28d0ef35ffb7c0880933d6b88cc3f5bd.tar.bz2 | |
[gdb/testsuite, 1/2] Fix gdb.linespec/explicit.exp with check-read1
When running gdb.linespec/explicit.exp with check-read1, we get:
...
(gdb) PASS: gdb.linespec/explicit.exp: complete unique file name: break -source "3explicit.c"
break -source exp^Glicit^G^M
explicit.c explicit2.c ^M
(gdb) FAIL: gdb.linespec/explicit.exp: complete non-unique file name
...
The problem is that we have a gdb_test_multiple where we match two regexps:
...
set tst "complete non-unique file name"
send_gdb "break -source exp\t"
gdb_test_multiple "" $tst {
-re "break -source exp\\\x07licit" {
...
}
-re "break -source exp\\\x07l" {
# This pattern may occur when glibc debuginfo is installed.
...
}
}
...
but since second is a substring of the first, we'll usually match the first,
but with check-read1 we'll match the second.
Fix this by using a single regexp and merging the related code.
Tested on x86_64-linux.
gdb/testsuite/ChangeLog:
2019-07-29 Tom de Vries <tdevries@suse.de>
* gdb.linespec/explicit.exp: Fix gdb_test_multiple regexps where second
is a substring of the first for "complete non-unique file name".
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.linespec/explicit.exp | 15 |
2 files changed, 6 insertions, 14 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c2f9d66..498f4e4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2019-07-29 Tom de Vries <tdevries@suse.de> + * gdb.linespec/explicit.exp: Fix gdb_test_multiple regexps where second + is a substring of the first for "complete non-unique file name". + +2019-07-29 Tom de Vries <tdevries@suse.de> + * gdb.python/python.exp: Don't terminate gdb_test_multiple regexp with ".*". diff --git a/gdb/testsuite/gdb.linespec/explicit.exp b/gdb/testsuite/gdb.linespec/explicit.exp index 11656ca..90181b3 100644 --- a/gdb/testsuite/gdb.linespec/explicit.exp +++ b/gdb/testsuite/gdb.linespec/explicit.exp @@ -241,20 +241,7 @@ namespace eval $testfile { -re "break -source exp\\\x07licit" { send_gdb "\t\t" gdb_test_multiple "" $tst { - -re "\\\x07\r\nexplicit.c\[ \t\]+explicit2.c\[ \t\]+\r\n$gdb_prompt" { - send_gdb "\n" - gdb_test "" \ - {Source filename requires function, label, or line offset.} \ - $tst - } - } - } - - -re "break -source exp\\\x07l" { - # This pattern may occur when glibc debuginfo is installed. - send_gdb "\t\t" - gdb_test_multiple "" $tst { - -re "\\\x07\r\nexplicit.c\[ \t\]+explicit2.c\[ \t\]+expl.*\r\n$gdb_prompt" { + -re "\\\x07\r\nexplicit.c\[ \t\]+explicit2.c\[ \t\]+\(expl.*\)?\r\n$gdb_prompt" { send_gdb "\n" gdb_test "" \ {Source filename requires function, label, or line offset.} \ |