diff options
author | Tom de Vries <tdevries@suse.de> | 2020-03-17 08:56:35 +0100 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2020-03-17 08:56:35 +0100 |
commit | 7325b16ba4dc33a54356fd2b8fde79311c51b121 (patch) | |
tree | cd4fdd7a90ca30de1b97dfd30cb6eebf6a671227 | |
parent | 771dd3a88b1f0e03a110fc4f2207913df45f8b4b (diff) | |
download | binutils-7325b16ba4dc33a54356fd2b8fde79311c51b121.zip binutils-7325b16ba4dc33a54356fd2b8fde79311c51b121.tar.gz binutils-7325b16ba4dc33a54356fd2b8fde79311c51b121.tar.bz2 |
[gdb/testsuite] Give up after consecutive timeouts in completion-support.exp
When running test-case gdb.linespec/cpcompletion.exp with target board
unix/-flto/-O0/-flto-partition=none/-ffat-lto-objects, we run into lots of
timeouts, in particular with this pattern:
...
FAIL: gdb.linespec/cpcompletion.exp: template-ret-type: \
cmd complete "b template2_"
FAIL: gdb.linespec/cpcompletion.exp: template-ret-type: \
tab complete "b template2_st" (timeout)
FAIL: gdb.linespec/cpcompletion.exp: template-ret-type: \
cmd complete "b template2_st"
FAIL: gdb.linespec/cpcompletion.exp: template-ret-type: \
tab complete "b template2_str" (timeout)
FAIL: gdb.linespec/cpcompletion.exp: template-ret-type: \
cmd complete "b template2_str"
FAIL: gdb.linespec/cpcompletion.exp: template-ret-type: \
tab complete "b template2_stru" (timeout)
...
Fix this by detecting timeouts in test_complete_prefix_range_re and giving up
after 3 consecutive timeouts.
This reduces testing time from ~39m to ~9m.
Tested on x86_64-linux.
-rw-r--r-- | gdb/testsuite/lib/completion-support.exp | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/gdb/testsuite/lib/completion-support.exp b/gdb/testsuite/lib/completion-support.exp index 03959e4..18eac82 100644 --- a/gdb/testsuite/lib/completion-support.exp +++ b/gdb/testsuite/lib/completion-support.exp @@ -108,13 +108,19 @@ proc test_gdb_complete_tab_unique { input_line complete_line_re append_char_re } set test "tab complete \"$input_line\"" send_gdb "$input_line\t" + set res 1 gdb_test_multiple "" "$test" { -re "^$complete_line_re$append_char_re$" { pass "$test" } + timeout { + fail "$test (timeout)" + set res -1 + } } clear_input_line $test + return $res } # Test that completing INPUT_LINE with TAB completes to "INPUT_LINE + @@ -242,7 +248,10 @@ proc test_gdb_complete_none { input_line } { proc test_gdb_complete_unique_re { input_line complete_line_re {append_char " "} {max_completions 0}} { set append_char_re [string_to_regexp $append_char] if { [readline_is_used] } { - test_gdb_complete_tab_unique $input_line $complete_line_re $append_char_re + if { [test_gdb_complete_tab_unique $input_line $complete_line_re \ + $append_char_re] == -1 } { + return -1 + } } # Trim INPUT_LINE and COMPLETE LINE, for the case we're completing @@ -266,6 +275,7 @@ proc test_gdb_complete_unique_re { input_line complete_line_re {append_char " "} } test_gdb_complete_cmd_unique $input_line $expected_output_re + return 1 } # Like TEST_GDB_COMPLETE_UNIQUE_RE, but COMPLETE_LINE is a string, not @@ -301,9 +311,22 @@ proc test_complete_prefix_range_re {input completion_re start {end -1}} { set end [string length $input] } + set timeouts 0 + set max_timeouts 3 for {set i $start} {$i < $end} {incr i} { set line [string range $input 0 $i] - test_gdb_complete_unique_re "$line" $completion_re + set res [test_gdb_complete_unique_re "$line" $completion_re] + if { $res == -1 } { + incr timeouts + } else { + if { $timeouts > 0 } { + set timeouts 0 + } + } + if { $timeouts == $max_timeouts } { + verbose -log "Consecutive timeouts in test_complete_prefix_range_re, giving up" + break + } } } |