diff options
| author | Pedro Alves <palves@redhat.com> | 2019-07-03 16:57:50 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2019-07-03 17:09:16 +0100 |
| commit | a994424fa1e80d982644038f1ce6538e247aeed1 (patch) | |
| tree | 8b22027e66cc8f4d58193df3a223a8b79628835e | |
| parent | 3d9be6f531db395a5ad940ef06e56d849f4de646 (diff) | |
| download | gdb-a994424fa1e80d982644038f1ce6538e247aeed1.zip gdb-a994424fa1e80d982644038f1ce6538e247aeed1.tar.gz gdb-a994424fa1e80d982644038f1ce6538e247aeed1.tar.bz2 | |
Fix latent bug in test_gdb_complete_cmd_multiple
A following patch will add the following to a testcase:
test_gdb_completion_offers_commands "| "
And that tripped on a latent testsuite bug:
(gdb) | PASS: gdb.base/shell.exp: tab complete "| "
^CQuit
(gdb) complete |
| !
| +
PASS: gdb.base/shell.exp: cmd complete "| "
| *** List may be truncated, max-completions reached. ***
(gdb) FAIL: gdb.base/shell.exp: set max-completions 200
set max-completions 200
The issue is that "|" ends up as part of a regexp, and "|" in regexps
has a special meaning...
Fix this with string_to_regexp.
gdb/testsuite/ChangeLog:
2019-07-03 Pedro Alves <palves@redhat.com>
* lib/completion-support.exp (test_gdb_complete_cmd_multiple): Use
string_to_regexp.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/completion-support.exp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8a426ff..601348f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2019-07-03 Pedro Alves <palves@redhat.com> + * lib/completion-support.exp (test_gdb_complete_cmd_multiple): Use + string_to_regexp. + +2019-07-03 Pedro Alves <palves@redhat.com> + * gdb.base/options.exp (expect_none, expect_flag, expect_bool) (expect_integer): Adjust to expect "-string". (expect_string): New. diff --git a/gdb/testsuite/lib/completion-support.exp b/gdb/testsuite/lib/completion-support.exp index 3199e85..abe48b4 100644 --- a/gdb/testsuite/lib/completion-support.exp +++ b/gdb/testsuite/lib/completion-support.exp @@ -200,8 +200,9 @@ proc test_gdb_complete_cmd_multiple { cmd_prefix completion_word completion_list set expected_re [make_cmd_completion_list_re $cmd_prefix $completion_list $start_quote_char $end_quote_char] if {$max_completions} { + set cmd_prefix_re [string_to_regexp $cmd_prefix] append expected_re \ - "$cmd_prefix \\*\\*\\* List may be truncated, max-completions reached\\. \\*\\*\\*.*\r\n" + "$cmd_prefix_re \\*\\*\\* List may be truncated, max-completions reached\\. \\*\\*\\*.*\r\n" } set cmd_re [string_to_regexp "complete $cmd_prefix$completion_word"] |