From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by sourceware.org (Postfix) with ESMTPS id 1BA55384D6CE for ; Mon, 12 Dec 2022 20:31:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1BA55384D6CE 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-f44.google.com with SMTP id ja17so3689458wmb.3 for ; Mon, 12 Dec 2022 12:31:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DjReEKZkQf50Ewz9sluKay4fBWbAlB47cl10RvVnbLg=; b=jGEwJsyVtgMAt5DaX6ulLDR+35dGMGLsENEPO4/dskos+UCYPrPXx/XsYXy7A0cZwp 4CY1Hk+zT2A3ignSqccc+6OsIT0Of8wySM0gbL/ynPJQNmP6iLwzLkfr/43EL2NAuQiu 8ROAXnQ2maWE3yaHa9NMBB1g07sxM9ez1S1k6fc9dz+55pzaNLEl81rkanOrDhCeFj9t PruGgebyjKwOhPppC+jbpIa184Ph1V6ysG9PQJtG1ZSQH4iCJNPidkEMI4VRNRQv2DjM QsJhvaNx4e+xiLHnYWCIIg8ksTPYEVlbdZtDB7O73GtGWDQBICQNBTz3RgiUAnSMC6B9 9eUQ== X-Gm-Message-State: ANoB5ploSaQdW7WzukDDWF/RFRjjeA9cllYKiw5hICwUTPI5khMrLXcp pk0q0G4npqMPewoBkQuFU+xFXejNuCxGAg== X-Google-Smtp-Source: AA0mqf70V+w1Rrm/WitIcHZ5b7a2WZ+NlXSqXQjavuMAT04Fn4R9OSl97G7c2trh7CkEKum1xYCwww== X-Received: by 2002:a05:600c:3b0c:b0:3d2:7ef:ac5 with SMTP id m12-20020a05600c3b0c00b003d207ef0ac5mr11087401wms.15.1670877073931; Mon, 12 Dec 2022 12:31:13 -0800 (PST) Received: from localhost ([2001:8a0:f912:6700:afd9:8b6d:223f:6170]) by smtp.gmail.com with ESMTPSA id p4-20020a1c5444000000b003d1e051f671sm10239700wmi.9.2022.12.12.12.31.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Dec 2022 12:31:13 -0800 (PST) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 12/31] Remove gdb/19675 kfails (displaced stepping + clone) Date: Mon, 12 Dec 2022 20:30:42 +0000 Message-Id: <20221212203101.1034916-13-pedro@palves.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20221212203101.1034916-1-pedro@palves.net> References: <20221212203101.1034916-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.3 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 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: 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 4192fa10826..e87382b2fa6 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