From patchwork Fri Oct 25 08:50:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 35297 Received: (qmail 10948 invoked by alias); 25 Oct 2019 08:50:47 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 10932 invoked by uid 89); 25 Oct 2019 08:50:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=Advance X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 25 Oct 2019 08:50:45 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 197CAB1B1; Fri, 25 Oct 2019 08:50:43 +0000 (UTC) Date: Fri, 25 Oct 2019 10:50:41 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Andrew Burgess , Luis Machado Subject: [committed][gdb/testsuite] Use -wrap and $gdb_test_name in gdb_test_multiple calls (2) Message-ID: <20191025085040.GA626@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, Make gdb_test_multiple calls shorter by using new gdb_test_multiple variable $gdb_test_name and new gdb_test_multiple pattern flag -wrap. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Use -wrap and $gdb_test_name in gdb_test_multiple calls (2) gdb/testsuite/ChangeLog: 2019-10-25 Tom de Vries * gdb.reverse/sigall-precsave.exp: Use -wrap and $gdb_test_name in gdb_test_multiple calls. * gdb.reverse/sigall-reverse.exp: Same. * gdb.reverse/solib-precsave.exp: Same. * gdb.reverse/solib-reverse.exp: Same. * gdb.reverse/until-precsave.exp: Same. * gdb.reverse/until-reverse.exp: Same. Change-Id: I67bb327d069dbc439410996bcfe6c7f905b2ca52 --- gdb/testsuite/gdb.reverse/sigall-precsave.exp | 14 ++++++-------- gdb/testsuite/gdb.reverse/sigall-reverse.exp | 22 +++++++++++----------- gdb/testsuite/gdb.reverse/solib-precsave.exp | 13 +++++-------- gdb/testsuite/gdb.reverse/solib-reverse.exp | 13 +++++-------- gdb/testsuite/gdb.reverse/until-precsave.exp | 13 +++++-------- gdb/testsuite/gdb.reverse/until-reverse.exp | 13 +++++-------- 6 files changed, 37 insertions(+), 51 deletions(-) diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp index 94ae26379f5..8584190a886 100644 --- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp +++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp @@ -258,18 +258,16 @@ foreach sig $signals { } } -set kfail_pattern "Process record does not support instruction 0xfae64 at.*" -set test "run to end of main" -gdb_test_multiple "continue" $test { - -re "Breakpoint .* end of main .*$gdb_prompt $" { - pass $test +gdb_test_multiple "continue" "run to end of main" { + -wrap -re "Breakpoint .* end of main .*" { + pass $gdb_test_name } - -re "Breakpoint .* handle_.*$gdb_prompt $" { + -wrap -re "Breakpoint .* handle_.*" { send_gdb "continue\n" exp_continue } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { - kfail "gdb/25038" $test + -wrap -re "Process record does not support instruction 0xfae64 at.*" { + kfail "gdb/25038" $gdb_test_name return -1 } } diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp index ecebf05ed7d..a4ed639f08f 100644 --- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp +++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp @@ -51,21 +51,21 @@ proc test_one_sig {nextsig} { if { $thissig == "IO" } { setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu" } - set testmsg "get signal $thissig" - set kfail_pattern "Process record does not support instruction 0xfae64 at.*" - gdb_test_multiple "continue" $testmsg { - -re "Program received signal SIG$thissig.*handle_$thissig.*$gdb_prompt $" { - fail "$testmsg (wrong location)" + gdb_test_multiple "continue" "get signal $thissig" { + -wrap -re \ + "Program received signal SIG$thissig.*handle_$thissig.*" { + fail "$gdb_test_name (wrong location)" } - -re "Program received signal SIG$thissig.*$gdb_prompt $" { - pass $testmsg + -wrap -re "Program received signal SIG$thissig.*" { + pass $gdb_test_name } - -re "Breakpoint.* handle_$thissig.*$gdb_prompt $" { - xfail $testmsg + -wrap -re "Breakpoint.* handle_$thissig.*" { + xfail $gdb_test_name set need_another_continue 0 } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { - kfail "gdb/25038" "$testmsg" + -wrap -re \ + "Process record does not support instruction 0xfae64 at.*" { + kfail "gdb/25038" $gdb_test_name set record_instruction_kfail 1 return } diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp index a3f874c09b7..165580d8a0a 100644 --- a/gdb/testsuite/gdb.reverse/solib-precsave.exp +++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp @@ -91,15 +91,12 @@ gdb_test "break $end_of_main" \ "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \ "breakpoint at end of main" -set test "run to end of main" -set pass_pattern "Breakpoint .* end of main .*" -set kfail_pattern "Process record does not support instruction 0xfae64 at.*" -gdb_test_multiple "continue" $test { - -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" { - pass $test +gdb_test_multiple "continue" "run to end of main" { + -wrap -re "Breakpoint .* end of main .*" { + pass $gdb_test_name } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { - kfail "gdb/25038" $test + -wrap -re "Process record does not support instruction 0xfae64 at.*" { + kfail "gdb/25038" $gdb_test_name return -1 } } diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp index 53b35239f81..6d4a8a1c0c3 100644 --- a/gdb/testsuite/gdb.reverse/solib-reverse.exp +++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp @@ -86,15 +86,12 @@ if [supports_process_record] { set end_part_one [gdb_get_line_number " end part one" "$srcfile"] set end_part_two [gdb_get_line_number " end part two" "$srcfile"] -set test "run until end part one" -set pass_pattern " end part one.*" -set kfail_pattern "Process record does not support instruction 0xfae64 at.*" -gdb_test_multiple "until $end_part_one" $test { - -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" { - pass $test +gdb_test_multiple "until $end_part_one" "run until end part one" { + -wrap -re " end part one.*" { + pass $gdb_test_name } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { - kfail "gdb/25038" $test + -wrap -re "Process record does not support instruction 0xfae64 at.*" { + kfail "gdb/25038" $gdb_test_name return -1 } } diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp index 1f09df193fd..ad59a522ff7 100644 --- a/gdb/testsuite/gdb.reverse/until-precsave.exp +++ b/gdb/testsuite/gdb.reverse/until-precsave.exp @@ -50,15 +50,12 @@ gdb_test "break $end_of_main" \ # This can take awhile. with_timeout_factor 20 { - set test "run to end of main" - set pass_pattern "Breakpoint .* set breakpoint 10a here .*" - set kfail_pattern "Process record does not support instruction 0xfae64 at.*" - gdb_test_multiple "continue" $test { - -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" { - pass $test + gdb_test_multiple "continue" "run to end of main" { + -wrap -re "Breakpoint .* set breakpoint 10a here .*" { + pass $gdb_test_name } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { - kfail "gdb/25038" $test + -wrap -re "Process record does not support instruction 0xfae64 at.*" { + kfail "gdb/25038" $gdb_test_name return -1 } } diff --git a/gdb/testsuite/gdb.reverse/until-reverse.exp b/gdb/testsuite/gdb.reverse/until-reverse.exp index 804e07f46ca..b7ce548bfcf 100644 --- a/gdb/testsuite/gdb.reverse/until-reverse.exp +++ b/gdb/testsuite/gdb.reverse/until-reverse.exp @@ -49,15 +49,12 @@ gdb_test "until $bp_location1" \ # Advance up to factorial, outer invocation # -set test "advance to factorial" -set pass_pattern "factorial .value=6..*$srcfile:$bp_location7.*" -set kfail_pattern "Process record does not support instruction 0xfae64 at.*" -gdb_test_multiple "advance factorial" $test { - -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" { - pass "$test" +gdb_test_multiple "advance factorial" "" { + -wrap -re "factorial .value=6..*$srcfile:$bp_location7.*" { + pass $gdb_test_name } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { - kfail "gdb/25038" $test + -wrap -re "Process record does not support instruction 0xfae64 at.*" { + kfail "gdb/25038" $gdb_test_name return -1 } }