From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 4DEA1385E82C for ; Mon, 16 Mar 2020 17:59:30 +0000 (GMT) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0EDD2AFD8 for ; Mon, 16 Mar 2020 17:59:29 +0000 (UTC) Date: Mon, 16 Mar 2020 18:59:26 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Give up after consecutive timeouts in completion-support.exp Message-ID: <20200316175925.GA5989@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-25.0 required=5.0 tests=GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Mar 2020 17:59:31 -0000 Hi, 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. OK for trunk? Thanks, - Tom [gdb/testsuite] Give up after consecutive timeouts in completion-support.exp --- gdb/testsuite/lib/completion-support.exp | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/completion-support.exp b/gdb/testsuite/lib/completion-support.exp index 03959e4c7f..18eac827f5 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 + } } }