From patchwork Wed Nov 23 18:39:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61031 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5B19F38518A8 for ; Wed, 23 Nov 2022 18:40:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B19F38518A8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669228841; bh=LiJu+/0nhPHBPnZwaDgNUPwqcfVsWxHtVVC44Z1OsSQ=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=AZSzotNtGFY1FPjMxzaFwg5gPvyTb2taCO9mWwojif2B+roACBIn9R3Ddp1XbP6a/ +ngiXMAiHKoTyApvfwfjgUn5hZd8NjUevVK2r/XOe4PNdBuWe6DWIPGhp4kwHMHDCZ 1wVi7OCG/FwBifYl3yakDLs68ynuz6LsPbFoh8cM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 1925038518A5 for ; Wed, 23 Nov 2022 18:40:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1925038518A5 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 2ANIe3gV026654 (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 2ANIe3gV026654 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 3B68E1E124; Wed, 23 Nov 2022 13:40:03 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 02/14] gdb/testsuite/gdb.base/break.exp: split test_break_file_line_convenience_var Date: Wed, 23 Nov 2022 13:39:47 -0500 Message-Id: <20221123183959.2476477-3-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 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 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-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change-Id: I0c31b037669b2917e062bf431372fb6531f8f53c --- gdb/testsuite/gdb.base/break.exp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index c0756cdccc23..be349d9e7eaf 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -868,18 +868,18 @@ gdb_test_multiple "" $test { } } -# # Test break via convenience variable with file name -# -with_test_prefix "set line:file breakpoint via convenience variable" { +proc_with_prefix test_break_file_line_convenience_var {} { + clean_restart breako2 + set line [gdb_get_line_number "set breakpoint 1 here"] gdb_test_no_output "set \$l = $line" set line_actual "-1" - set test "break ${srcfile}:\$l" + set test "break $::srcfile:\$l" gdb_test_multiple "$test" $test { - -re "Breakpoint $decimal at $hex: file .*break\\.c, line ($decimal)\\.\r\n$gdb_prompt $" { + -re "Breakpoint $::decimal at $::hex: file .*break\\.c, line ($::decimal)\\.\r\n$::gdb_prompt $" { # Save the actual line number on which the breakpoint was # actually set. On some systems (Eg: Ubuntu 16.04 with GCC # version 5.4.0), that line gets completely inlined, including @@ -892,11 +892,13 @@ with_test_prefix "set line:file breakpoint via convenience variable" { gdb_test_no_output "set \$foo=81.5" \ "set convenience variable \$foo to 81.5" - gdb_test "break $srcfile:\$foo" \ + gdb_test "break $::srcfile:\$foo" \ "Convenience variables used in line specs must have integer values.*" \ "non-integer convenience variable disallowed" } +test_break_file_line_convenience_var + # Test that commands can be cleared without error. proc_with_prefix test_break_commands_clear {} {