From patchwork Thu Jul 27 07:41:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinevere Larsen X-Patchwork-Id: 73257 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 E4BF93857027 for ; Thu, 27 Jul 2023 07:42:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E4BF93857027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690443744; bh=zYqkhN4uCC9aC6qcSDDwCTSxegdqc+lO3LRlt5Q5spo=; 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=RlMhRmIRoP7QXNP5xeldMJ6G1cEke6teQOpz+QIrBQJP42HbWrhNOZedqPk9APCI3 vRQi2SW7xZgm7i28dLN506kxrtn/jDosYX7oX/EvLLAAmLhjJS7O3nNuxPy8LF/iNw 2l332PX4emdXZ6o9/So9uFCStNS4iebkjqH0u+Y4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 50A5F385702B for ; Thu, 27 Jul 2023 07:41:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 50A5F385702B Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-3k3FVWf2O3KYWivL20tFKQ-1; Thu, 27 Jul 2023 03:41:57 -0400 X-MC-Unique: 3k3FVWf2O3KYWivL20tFKQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 393963814957 for ; Thu, 27 Jul 2023 07:41:42 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.155]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B2A714094DC1; Thu, 27 Jul 2023 07:41:41 +0000 (UTC) To: gdb-patches@sourceware.org Cc: Bruno Larsen Subject: [PATCH v2 2/4] gdb/testsuite: fix gdb.reverse/solib-*.exp tests when using clang Date: Thu, 27 Jul 2023 09:41:16 +0200 Message-ID: <20230727074118.1583199-3-blarsen@redhat.com> In-Reply-To: <20230727074118.1583199-1-blarsen@redhat.com> References: <20230725095833.236804-1-blarsen@redhat.com> <20230727074118.1583199-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Bruno Larsen via Gdb-patches From: Guinevere Larsen Reply-To: Bruno Larsen Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The tests gdb.reverse/solib-precsave.exp and solib-reverse.exp have the assumption that line tables will have an entry for the closing } in a function. Not all compiles do this, one example being clang. To fix this, this commit changes the function in shr2.c to have multiple lines, and the test to accept either line as a correct step location. To properly re-sync the inferiors, the function repeat_cmd_until had to be slightly changed to work with empty "current locations", so that we are able to step through multiple lines. This also changes the annotations used to determine the breakpoint locations in solib-reverse.c, adding a simple variable assignment right before the return statement. This way GDB will not set a breakpoint in the closing } line. --- gdb/testsuite/gdb.reverse/shr2.c | 3 ++- gdb/testsuite/gdb.reverse/solib-precsave.exp | 24 ++++++++++++++++---- gdb/testsuite/gdb.reverse/solib-reverse.c | 5 ++-- gdb/testsuite/gdb.reverse/solib-reverse.exp | 24 ++++++++++++++++---- gdb/testsuite/lib/gdb.exp | 6 ++--- 5 files changed, 48 insertions(+), 14 deletions(-) diff --git a/gdb/testsuite/gdb.reverse/shr2.c b/gdb/testsuite/gdb.reverse/shr2.c index 84a03de1b8c..16c3bf3bc6c 100644 --- a/gdb/testsuite/gdb.reverse/shr2.c +++ b/gdb/testsuite/gdb.reverse/shr2.c @@ -19,7 +19,8 @@ int shr2(int x) { - return 2*x; + int y = 2*x; + return y; } int shr2_local(int x) diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp index 3ca73828063..f89969222c6 100644 --- a/gdb/testsuite/gdb.reverse/solib-precsave.exp +++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp @@ -140,8 +140,17 @@ gdb_test_multiple "reverse-step" "reverse-step into solib function one" { pass $gdb_test_name } } -gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one" -gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one" +# Depending on wether the closing } has a line associated, we might have +# different acceptable results here +gdb_test_multiple "reverse-step" "reverse-step within solib function one" { + -re -wrap "return y;.*" { + pass $gdb_test_name + } + -re -wrap "int y =.*" { + pass $gdb_test_name + } +} +repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main one" gdb_test_multiple "reverse-step" "reverse-step into solib function two" { -re -wrap "begin part two.*" { @@ -152,8 +161,15 @@ gdb_test_multiple "reverse-step" "reverse-step into solib function two" { pass $gdb_test_name } } -gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two" -gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two" +gdb_test_multiple "reverse-step" "reverse-step within solib function two" { + -re -wrap "return y;.*" { + pass $gdb_test_name + } + -re -wrap "int y =.*" { + pass $gdb_test_name + } +} +repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main two" # # Test reverse-next over debuggable solib function diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.c b/gdb/testsuite/gdb.reverse/solib-reverse.c index 7aa60089df3..20288e0bee8 100644 --- a/gdb/testsuite/gdb.reverse/solib-reverse.c +++ b/gdb/testsuite/gdb.reverse/solib-reverse.c @@ -43,6 +43,7 @@ int main () shr1 ("message 2\n"); /* shr1 two */ shr1 ("message 3\n"); /* shr1 three */ - return 0; /* end part one */ -} /* end of main */ + b[0] = 0; /* end part one */ + return 0; /* end of main */ +} diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp index c061086a8d7..afc4659184a 100644 --- a/gdb/testsuite/gdb.reverse/solib-reverse.exp +++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp @@ -116,8 +116,17 @@ gdb_test_multiple "reverse-step" "reverse-step into solib function one" { pass $gdb_test_name } } -gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one" -gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one" +# Depending on wether the closing } has a line associated, we might have +# different acceptable results here +gdb_test_multiple "reverse-step" "reverse-step within solib function one" { + -re -wrap "return y;.*" { + pass $gdb_test_name + } + -re -wrap "int y =.*" { + pass $gdb_test_name + } +} +repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main one" gdb_test_multiple "reverse-step" "reverse-step into solib function two" { -re -wrap "begin part two.*" { @@ -128,8 +137,15 @@ gdb_test_multiple "reverse-step" "reverse-step into solib function two" { pass $gdb_test_name } } -gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two" -gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two" +gdb_test_multiple "reverse-step" "reverse-step within solib function two" { + -re -wrap "return y;.*" { + pass $gdb_test_name + } + -re -wrap "int y =.*" { + pass $gdb_test_name + } +} +repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main two" # # Test reverse-next over debuggable solib function diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 66c04a2efe2..63b6291fc36 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9679,6 +9679,9 @@ proc repeat_cmd_until { command current target \ set count 0 gdb_test_multiple "$command" "$test_name" { + -re "$target.*$gdb_prompt $" { + pass "$test_name" + } -re "$current.*$gdb_prompt $" { incr count if { $count < $max_steps } { @@ -9688,9 +9691,6 @@ proc repeat_cmd_until { command current target \ fail "$test_name" } } - -re "$target.*$gdb_prompt $" { - pass "$test_name" - } } }