From patchwork Thu Mar 14 17:56:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87210 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 ACAC13857C60 for ; Thu, 14 Mar 2024 17:57:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id 9BE683858C60 for ; Thu, 14 Mar 2024 17:56:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9BE683858C60 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9BE683858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710439009; cv=none; b=yA7q34hHmOXRaTTsSYwWJI086UVE5xp0NtxyV+BM0m5RbIqKAMmL/cZvp4V74EY9U/4q2YHRAc25tm2pb5g3hoaotrqx40fnwzGj185/PxGqVWMpeloy2EbZ1oI2Ekeu2wj+rdlnUek57oNN8qsG2Ca+dPOcU3P8WJmITsl0EQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710439009; c=relaxed/simple; bh=8lOr1YeBbQ1+oYmYIYJcUBN2z9FrAVc/R4AcQPbHjFw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GRNSfbH5A8xu1FComEd6tuFQ8Dj7wEx7S+8YJjA0ptyaTzg6xH1daTFVWOqPZKM9twFOkRRbAu03bB1bwriWtmwCDXoCCnj6hfabfKrUx4sveC/Qw/Ffyaf5DHKxlEWlcmkLemd9T6uzKcwKs3orueXDHMRbz9At7TJf8avGIt0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7c8c71ebe33so22411439f.3 for ; Thu, 14 Mar 2024 10:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710439004; x=1711043804; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3HOmrmFq8TLzlbziuoqXUqCDwmLqP/FpMq0c0jBUNWA=; b=WRa9SKlw79kpYyDKuxqxYqWAgIJo6mO7rzGc2tcW3/zO8ZPZLcb6JMqwrGBJ4Jf+ZU m/63eyLYmJD7l45lqOJAOdNBX7qFtYwZoxDStC6CZbQ0ixj+JA1ag1TWsCcHo0fewZl3 0ReKeG6/Szhlv88bHJrJD7K00ydRDTWGfdmWrzQ2dvo65xv2ccvLa2OUeojDRGv4pI/x aLO8a4hc3Ql3R8COqil5HFzMkgJVrRO51i2Vr+cPH6WXPfjgvvYejy+oV9nseY67jxtp Mv0JYK9m3oAHk1c71zBiT+AY27zyXAWr7zDLugws5UDqCn7UmywDIUPws28+x2coQqSs 9/uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710439004; x=1711043804; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3HOmrmFq8TLzlbziuoqXUqCDwmLqP/FpMq0c0jBUNWA=; b=aX1HePQZPyiHfG1Qn9x4mF/dGwTmu9rfn0IQJdTErQVhlXioHH74bu0XgtyBbPDsyC wZljqPFQeZUZ18cGZjtyXLh+Nrka1p87GFXEMBDWOSbm/x6FPoxmhSKwakaNhBsldV7C ylqWDfj6Acd5EHyYko93/EeAczM/stlRXgRoyKOBS+hXcpkI6BTdrH3kRoSU/BxXrrMQ C0+W8+s+aDETVZqEL6FNSybBnefNODnQw/L2PGKqKentyAsQCMcbsUC2Xb4bfIMDWPrR 7GHicQSlx4lVlkMlNsFIw88PVxrHr+kx6mTCKNJG2W4E+n8OsnaFH4MiBoS4GwuAGK/o TMEQ== X-Gm-Message-State: AOJu0YzVtZGbZE2W3LKyOnRNHRMaXpDao0Rwwn2ztzL21Wf8FdXBO+ZN TOm5dtt93fTrLlRL7BBAMzPmAkvM1Z+bEFDfvDmeORGm/NZ27rXW1qg/s9mdOUUGeGkwdQJLFLk = X-Google-Smtp-Source: AGHT+IH/TJ2sznpWJ006ngRWPgfb8oHyLbSgykIUpB4g3k1IgewSuM+lRi/Cqr/RMvkkrcDBsjLvfQ== X-Received: by 2002:a6b:7844:0:b0:7c8:d7fd:7f54 with SMTP id h4-20020a6b7844000000b007c8d7fd7f54mr2980149iop.3.1710439003803; Thu, 14 Mar 2024 10:56:43 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id g5-20020a02b705000000b0047472bc0182sm282844jam.63.2024.03.14.10.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 10:56:43 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Clear board_info entry in kill_wait_spawned_process Date: Thu, 14 Mar 2024 11:56:33 -0600 Message-ID: <20240314175633.1090335-1-tromey@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org When certain DAP tests are run in a certain order, dejagnu will throw an exception during shutdown. After adding many logging statements, I tracked this down to kill_wait_spawned_process not clearing the 'fileid' board_info entry, causing dejagnu to try to wait for the process a second time -- and fail. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31435 --- gdb/testsuite/lib/gdb.exp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index fe4ac7d2719..48c241ad178 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -6194,6 +6194,11 @@ proc kill_wait_spawned_process { proc_spawn_id } { # wait for the PID in the background. That's fine because we # don't care about the exit status. */ wait -nowait -i $proc_spawn_id + + # Don't let dejagnu try to clean this up, either. + global board_info + set name [board_info target name] + unset -nocomplain board_info($name,fileid) } # Returns the process id corresponding to the given spawn id.