From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by sourceware.org (Postfix) with ESMTPS id ED435388B69B for ; Wed, 13 Jul 2022 22:25:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ED435388B69B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f45.google.com with SMTP id n185so7328752wmn.4 for ; Wed, 13 Jul 2022 15:25:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=60eawDR9ThtnTGR+2jEEfBqahXm9hrluuUv+Qg6Lx2w=; b=gGY5v2W2iI/6gtljUFnDMTaJjfiok5KBtn5Wcq3/Enb9tdDV7A6SHsichOyMoZKn1f 4b450xgdrLLhFVS8TQOqfW+6Qn4qAkp0ab4HNV81zEuDtWSHUdHEAZ/vb/NaooHTn/V5 W6XuLyJoeyXoV6O+DvSouYxS0UxbPd9A+j0cJw3AxlnQUL0Aa7torKPM56TVfUgg15eN FeqZwoYQ30FaTvP71sQ2GHaxAiuSPp4mhASdFIUzTiyxhrUBwGUYNslh+XHVOqtcY75g RP3GyvbLobCEOAWbwXY9OxCPTajosWFHMfnO39Pg79UwbF1gtgee3Lj/kS+lVtpNct6f S2jw== X-Gm-Message-State: AJIora8g8Ljwq0ltqSRqHRg6S7OQOvEf5qSIsP+pVfSlK627w9ECxO6/ hGvhOrOim8aUu0bEeRTvqrdEfmtrNt0= X-Google-Smtp-Source: AGRyM1sOLko+mp+vFMkTGwanTLJ5W1ebHQBzX1I700ldnLVWMbA6E63xZu/q19r2UxUifyBjQ61Y5Q== X-Received: by 2002:a7b:c381:0:b0:3a2:aef9:8dc8 with SMTP id s1-20020a7bc381000000b003a2aef98dc8mr5869961wmj.51.1657751100229; Wed, 13 Jul 2022 15:25:00 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id t63-20020a1c4642000000b003a2e05a81b3sm3375825wma.8.2022.07.13.15.24.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Jul 2022 15:24:59 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 11/29] Remove gdb/19675 kfails (displaced stepping + clone) Date: Wed, 13 Jul 2022 23:24:15 +0100 Message-Id: <20220713222433.374898-12-pedro@palves.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220713222433.374898-1-pedro@palves.net> References: <20220713222433.374898-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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-List-Received-Date: Wed, 13 Jul 2022 22:25:03 -0000 Now that gdb/19675 is fixed for both native and gdbserver GNU/Linux, remove the gdb/19675 kfails. Change-Id: I95c1c38ca370100675d303cd3c8995860bef465d Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=19675 --- gdb/testsuite/gdb.base/step-over-syscall.exp | 44 ++------------------ 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp index 788f6e3f5d0..e7f52bba70f 100644 --- a/gdb/testsuite/gdb.base/step-over-syscall.exp +++ b/gdb/testsuite/gdb.base/step-over-syscall.exp @@ -42,46 +42,17 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } { } proc_with_prefix check_pc_after_cross_syscall { displaced syscall syscall_insn_next_addr } { - global gdb_prompt - set syscall_insn_next_addr_found [get_hexadecimal_valueof "\$pc" "0"] # After the 'stepi' we expect thread 1 to still be selected. - # However, when displaced stepping over a clone bug gdb/19675 - # means this might not be the case. - # - # Which thread we end up in depends on a race between the original - # thread-1, and the new thread (created by the clone), so we can't - # guarantee which thread we will be in at this point. - # - # For the fork/vfork syscalls, which are correctly handled by - # displaced stepping we will always be in thread-1 or the original - # process at this point. set curr_thread "unknown" - gdb_test_multiple "info threads" "" { - -re "Id\\s+Target Id\\s+Frame\\s*\r\n" { - exp_continue - } - -re "^\\* (\\d+)\\s+\[^\r\n\]+\r\n" { + gdb_test_multiple "thread" "" { + -re -wrap "Current thread is (\\d+) .*" { set curr_thread $expect_out(1,string) - exp_continue - } - -re "^\\s+\\d+\\s+\[^\r\n\]+\r\n" { - exp_continue - } - -re "$gdb_prompt " { + pass $gdb_test_name } } - # If we are displaced stepping over a clone, and we ended up in - # the wrong thread then the following check of the $pc value will - # fail. - if { $displaced == "on" && $syscall == "clone" && $curr_thread != 1 } { - # GDB doesn't support stepping over clone syscall with - # displaced stepping. - setup_kfail "*-*-*" "gdb/19675" - } - gdb_assert {$syscall_insn_next_addr != 0 \ && $syscall_insn_next_addr == $syscall_insn_next_addr_found \ && $curr_thread == 1} \ @@ -299,15 +270,6 @@ proc step_over_syscall { syscall } { gdb_test "break marker" "Breakpoint.*at.* file .*${testfile}.c, line.*" - # If we are displaced stepping over a clone syscall then - # we expect the following check to fail. See also the - # code in check_pc_after_cross_syscall. - if { $displaced == "on" && $syscall == "clone" } { - # GDB doesn't support stepping over clone syscall with - # displaced stepping. - setup_kfail "*-*-*" "gdb/19675" - } - gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker \\(\\) at.*" \ "continue to marker ($syscall)" } -- 2.36.0