From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 4FFBB38518A6 for ; Wed, 23 Nov 2022 18:40:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4FFBB38518A6 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2ANIe3ot026662 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Nov 2022 13:40:08 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2ANIe3ot026662 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1669228808; bh=CCIcMEkPMJq5fjCTUU89BFl0CSDxAXTiHuRoyf85YV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=guq5Tq2k+cZgcEiQoRTakCOJxYebnURhDs0n1svduYtDf1V+dz+2pn+vVltO6P1HG 0hnwllIsWWPXnIjSOdBeOKJh9IaSn5oiHPz9i1k9bKuuR7exv+kuxXF8SYm2SFRdzs IveG4/fGIKt5C3qLbQWZ5IIaOEydlgG1Y7W9wseQ= Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 6F4701E126; Wed, 23 Nov 2022 13:40:03 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 03/14] gdb/testsuite/gdb.base/break.exp: split test_rbreak_shlib Date: Wed, 23 Nov 2022 13:39:48 -0500 Message-Id: <20221123183959.2476477-4-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221123183959.2476477-1-simon.marchi@polymtl.ca> References: <20221123183959.2476477-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 23 Nov 2022 18:40:03 +0000 X-Spam-Status: No, score=-3189.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Change-Id: I130e8914c2713095aab03e84aba1481b4c7af978 --- gdb/testsuite/gdb.base/break.exp | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index be349d9e7eaf..a9728798fab9 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -835,9 +835,6 @@ gdb_test_multiple "continue" \ } } -clean_restart breako2 - -# # test that 'rbreak' on a symbol that may be from a shared library doesn't # cause a "Junk at end of arguments." error. # @@ -846,28 +843,31 @@ clean_restart breako2 # Note that this test won't necessarily choke on all targets even if # all the rbreak issue is present. rbreak needs to match and set a # breakpoint on a symbol causes 'break' to choke. -# -gdb_test_no_output "set breakpoint pending on" "rbreak junk pending setup" +proc_with_prefix test_rbreak_shlib {} { + clean_restart breako2 -# We expect at least one breakpoint to be set when we "rbreak main". -gdb_test "rbreak main" \ - ".*Breakpoint.*at.* file .*$srcfile, line.*" \ - "rbreak junk set breakpoint" + gdb_test_no_output "set breakpoint pending on" "rbreak junk pending setup" -# Run to a breakpoint. Fail if we see "Junk at end of arguments". -gdb_run_cmd + # We expect at least one breakpoint to be set when we "rbreak main". + gdb_test "rbreak main" \ + ".*Breakpoint.*at.* file .*$::srcfile, line.*" -set test "rbreak junk" -gdb_test_multiple "" $test { - -re "Junk at end of arguments" { - fail $test - } - -re ".*Breakpoint \[0-9\]+,.*$gdb_prompt $" { - pass $test + # Run to a breakpoint. Fail if we see "Junk at end of arguments". + gdb_run_cmd + + gdb_test_multiple "" "rbreak junk" { + -re -wrap "Junk at end of arguments.*" { + fail $gdb_test_name + } + -re -wrap ".*Breakpoint \[0-9\]+,.*" { + pass $gdb_test_name + } } } +test_rbreak_shlib + # Test break via convenience variable with file name proc_with_prefix test_break_file_line_convenience_var {} { -- 2.38.1