From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id +IDeJepls2eWezQAWB0awg (envelope-from ) for ; Mon, 17 Feb 2025 11:38:02 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=rAiH0n25; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=S4rHfE8j; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=rAiH0n25; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=S4rHfE8j; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 9628D1E105; Mon, 17 Feb 2025 11:38:02 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.0 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 156681E05C for ; Mon, 17 Feb 2025 11:38:02 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9807A3858C33 for ; Mon, 17 Feb 2025 16:38:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9807A3858C33 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=rAiH0n25; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=S4rHfE8j; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=rAiH0n25; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=S4rHfE8j Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id EA9783858D39 for ; Mon, 17 Feb 2025 16:36:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EA9783858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EA9783858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739810192; cv=none; b=dN/2LmgSU1uHgGCH4v+lZjBrHxE01wFSsL1pwl6CHO5XbIU8vWnv/YItOqFhl/NgvwWWmh64v/q8Nl3dQQGznhTyLCWzmJuZnfAEO56tuFJLJYFT2VkpAt3jAA6StX7hfUsWzs0rN/9zJZQrDBo9VkICd7xPFd5z3VUKkbPThvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739810192; c=relaxed/simple; bh=nRBYC8UmTt82ou+IGTyQzsHL+RU2jtsresieSfJ3Cgo=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=siaZ8aZO/u7CYcntUqZ6NjcII3KaDSyCgSqkC6D30CbbsirmoED5201MsM5f5QDKy52TB5NVAutxcZd2faaXi1aKlwj59HqOx6chkrdgDK6RUeBcY5s6Of4QbWj0gL8wXpwYpGV0F3C3XLJ1RXV1IZGGlNG7qPuD2hGNXLlXGAo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA9783858D39 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 931441F455 for ; Mon, 17 Feb 2025 16:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739810176; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3xyegiDpf0I8gaPR0IpFFIFroZna7k9CU4CtyHQQ9g=; b=rAiH0n254e63ZxOf0XWQ8xJ90yaVPOn64ogl1KlOcMmP4FrRvgB7QddB4xAHqSxYBY/OvM /gKznO4yBeFpw02b45bte8ulmO20kJaKHw9bFETCdFeKZ2E+dY7oLSQb1DM9P0vBYRh2eP g2vKdzXNT8tZaAWE5vs/YeJCWV7gwbk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739810176; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3xyegiDpf0I8gaPR0IpFFIFroZna7k9CU4CtyHQQ9g=; b=S4rHfE8jigmo6XSy16wRYRhC0aGABk4EWIrAfrFs+cUkNO04LPAQjByViNqu27BJMK2Mem Elf96ZtuHV+1htCg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=rAiH0n25; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=S4rHfE8j DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739810176; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3xyegiDpf0I8gaPR0IpFFIFroZna7k9CU4CtyHQQ9g=; b=rAiH0n254e63ZxOf0XWQ8xJ90yaVPOn64ogl1KlOcMmP4FrRvgB7QddB4xAHqSxYBY/OvM /gKznO4yBeFpw02b45bte8ulmO20kJaKHw9bFETCdFeKZ2E+dY7oLSQb1DM9P0vBYRh2eP g2vKdzXNT8tZaAWE5vs/YeJCWV7gwbk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739810176; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3xyegiDpf0I8gaPR0IpFFIFroZna7k9CU4CtyHQQ9g=; b=S4rHfE8jigmo6XSy16wRYRhC0aGABk4EWIrAfrFs+cUkNO04LPAQjByViNqu27BJMK2Mem Elf96ZtuHV+1htCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7A42213AC1 for ; Mon, 17 Feb 2025 16:36:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id WE2dHIBls2eBUAAAD6G6ig (envelope-from ) for ; Mon, 17 Feb 2025 16:36:16 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/3] [gdb/testsuite] Kill left-over process in gdb.base/add-symbol-file-attach.exp Date: Mon, 17 Feb 2025 17:36:18 +0100 Message-ID: <20250217163619.8662-3-tdevries@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217163619.8662-1-tdevries@suse.de> References: <20250217163619.8662-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 931441F455 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid, suse.de:dkim, imap1.dmz-prg2.suse.org:rdns, imap1.dmz-prg2.suse.org:helo] X-Rspamd-Server: rspamd1.dmz-prg2.suse.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~public-inbox=simark.ca@sourceware.org When running test-case gdb.base/add-symbol-file-attach.exp, the process spawned by: ... set test_spawn_id [spawn_wait_for_attach $binfile] ... is not cleaned up. The usual way to fix this is to add "kill_wait_spawned_process $test_spawn_id" at the end of the test-case. However, that doesn't look robust enough to me: in case of running into some form of trouble in the test-case, that cleanup may not be reached. I considered adding a wrapper proc like save_vars, but that makes fixing this a bit intrusive since it requires re-indenting most of the test-case. Instead, add a new proc at_finish_kill_wait: ... set test_spawn_id [spawn_wait_for_attach $binfile] +at_finish_kill_wait $test_spawn_id ... that schedules the cleanup for test-case finish. While we're at it, make sure that we check for the result of spawn_wait_for_attach, and since this: ... UNSUPPORTED: $exp: require failed: !string equal $test_spawn_id "-1" ... is somewhat hard to parse, add proc valid_spawn_id to get the more readable: ... UNSUPPORTED: $exp: require failed: valid_spawn_id $test_spawn_id ... Tested on x86_64-linux. PR testsuite/32709 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32709 --- .../gdb.base/add-symbol-file-attach.exp | 3 +++ gdb/testsuite/lib/gdb.exp | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/gdb/testsuite/gdb.base/add-symbol-file-attach.exp b/gdb/testsuite/gdb.base/add-symbol-file-attach.exp index e39a26ab666..97e0e018fc7 100644 --- a/gdb/testsuite/gdb.base/add-symbol-file-attach.exp +++ b/gdb/testsuite/gdb.base/add-symbol-file-attach.exp @@ -44,6 +44,9 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { # so that GDB may attach to it. set test_spawn_id [spawn_wait_for_attach $binfile] +require {valid_spawn_id $test_spawn_id} +at_finish_kill_wait $test_spawn_id + set testpid [spawn_id_get_pid $test_spawn_id] gdb_start diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index d4634c85725..7c2d185b690 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -101,6 +101,16 @@ append_environment_default ASAN_OPTIONS detect_leaks 0 # List of procs to run in gdb_finish. set gdb_finish_hooks [list] +# List of spawn_ids to kill-and-wait-for-exit in gdb_finish. +set gdb_finish_kill_wait {} + +# Schedule each arg for kill-and-wait-for-exit in gdb_finish. +proc at_finish_kill_wait { args } { + foreach arg $args { + lappend ::gdb_finish_kill_wait $arg + } +} + # Variable in which we keep track of globals that are allowed to be live # across test-cases. array set gdb_persistent_globals {} @@ -6913,6 +6923,12 @@ proc spawn_wait_for_attach { executable_list } { return [spawn_wait_for_attach_1 $executable_list] } +# Return 1 if SPAWN_ID is a valid spawn id. + +proc valid_spawn_id { spawn_id } { + return [expr ![string equal $spawn_id "-1"]] +} + # # gdb_load_cmd -- load a file into the debugger. # ARGS - additional args to load command. @@ -7884,6 +7900,11 @@ proc gdb_finish { } { set gdb_finish_hooks [list] gdb_cleanup_globals + + foreach spawn_id $::gdb_finish_kill_wait { + kill_wait_spawned_process $spawn_id + } + set ::gdb_finish_kill_wait {} } global debug_format -- 2.43.0