From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id HfqzFR+tuGqKPwsAWB0awg (envelope-from ) for ; Sun, 27 Sep 2026 01:43:59 -0400 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=Yla5czx1; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=A6ePFyQ8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=orJKCrdC; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=wS4Spc10; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 1DB4D1E090; Sun, 27 Sep 2026 01:43:59 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.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,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 88CC81E033 for ; Sun, 27 Sep 2026 01:43:55 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1BF284B9DB45 for ; Sun, 27 Sep 2026 05:43:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1BF284B9DB45 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=Yla5czx1; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=A6ePFyQ8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=orJKCrdC; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=wS4Spc10 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 345704BA79B1 for ; Sun, 27 Sep 2026 05:43:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 345704BA79B1 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 345704BA79B1 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790487785; cv=none; b=VhYaQeQNz7ZDH2OkUp6qcB2FZqrUqw1/mJfZ2x5XkFMUiaBNscBsozvZkxRA4hSv0lpsdDZP4q8hg8rHRtY/EKkUSV5cImMyPBoCzOmhTaBv62cB0GyzHvw2ga3TzJ8gZSqbO9Zj3HJs3HD3Jns+ohAR8FDNhXydN2xwHqtCLEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790487785; c=relaxed/simple; bh=/9e2D6V3jxUUw8ykwsw8XUu+BkInOfxnJYlnDlXRsAw=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=HwrjSs9Xy9yg5MzG9UJoOaVJ9kkAQ2Okg7WuaXpvzpyVbXrfw7QknJDh/tPPwSijm61HwEyeslxbQswoYXnx+ctSu543BLy1/ADy7SCCU6UC8ldCYq6c5JAh13XZbyd+uCov7yV0FYMUNsBzmadCc3nXg8J/YyMZKVtX11ld0W0= ARC-Authentication-Results: i=1; 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=Yla5czx1; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=A6ePFyQ8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=orJKCrdC; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=wS4Spc10 DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 345704BA79B1 Received: from imap1.dmz-prg2.suse.org (unknown [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-out1.suse.de (Postfix) with ESMTPS id C682321E8F for ; Sun, 27 Sep 2026 05:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790487779; 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=OESyZMMeyefZ86OSGAqpcmBjrd1SSEAIR4HE10W7ZcI=; b=Yla5czx1BBovarE7fGI8JGCLlw4LiWEXzgOqH+9UGrPsahzmg/HM+RenlUZ1Efa+576WyB oE655CBNN3BDJQvREgAAr4QO9L6V7Gs3+Ox1du5ZykYCQy/B6ftE7AV03xQG28IPwxVTpI XMWKW8il328rqUp56DaXboaVEwHo9Sg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790487779; 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=OESyZMMeyefZ86OSGAqpcmBjrd1SSEAIR4HE10W7ZcI=; b=A6ePFyQ8GjAPw3D3PkJLqtUFcMRo6G9NS6OM04D7jC/Tbr8Xm8gLr9Ge86AH8VKUNxqOFA s/5/Gf+kNdMp1uCA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790487775; 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=OESyZMMeyefZ86OSGAqpcmBjrd1SSEAIR4HE10W7ZcI=; b=orJKCrdCb1uv8LDGAIHWIQEOe6t1yaxHNC1wAMwbw5tlF08LfKhtElajPvTNiH1HC5+s+7 8h8Gnxg0ROcPwwitYMIxOfp221sZzsRUrENEMAU0L/gWmP9YyaXmCBtoYAkiIohQxEqe3v BH54PfzbhoREMyNR/pr4AqF2DMZEak0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790487775; 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=OESyZMMeyefZ86OSGAqpcmBjrd1SSEAIR4HE10W7ZcI=; b=wS4Spc108UyKCyUuT4v6WZNuDLyvUYeyTWtLomjwKFeNtgI7mvkK7uJHUbtp6VH5ox+E8O +4hxa+Hd7YkMwhBA== 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 570A3133F3 for ; Sun, 27 Sep 2026 05:42:55 +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 nU6MAN+suGrVKAAAD6G6ig:T2 (envelope-from ) for ; Sun, 27 Sep 2026 05:42:55 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 1/2] [gdb/testsuite] Simplify core_find Date: Sun, 27 Sep 2026 07:42:53 +0200 Message-ID: <20260927054254.1986148-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260927054254.1986148-1-tdevries@suse.de> References: <20260927054254.1986148-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 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)[]; NEURAL_HAM_SHORT(-0.20)[-0.993]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] 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 In proc core_find we have: ... catch "system \"(cd ${coredir}; ulimit -c unlimited; $coredump_filter_cmd; ${binfile} ${arg}; true) >${output_file} 2>&1\"" ... We can rewrite this into something more readable with less quote and escape magic: ... set arg [subst -nocommands -novariables $arg] set cmd [subst_vars { (cd ${coredir}; ulimit -c unlimited; $coredump_filter_cmd; ${binfile} ${arg}; true) \ >${output_file} 2>&1}] catch { system $cmd } ... The "set arg [subst ... $arg]" is a bit awkward, and dropping it allows us to update test-case gdb.base/corefile-exec-context.exp to use a bit more typical setup with string_to_regex. Note that what is being tested hasn't changed. We can print the effective value of arg by adding to the command passed to system. Without this patch using: ... echo \\\"$arg\\\; ... and with this patch using: ... echo "$arg"; ... and in both cases we get: ... aaaaa bbbbb ccccc ddddd e\ e\ e\ e\ e ... --- .../gdb.base/corefile-exec-context.exp | 13 +++++++--- gdb/testsuite/lib/gdb.exp | 26 ++++++++++++++++--- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/gdb.base/corefile-exec-context.exp b/gdb/testsuite/gdb.base/corefile-exec-context.exp index 9b018533b68..56c68a6a5cd 100644 --- a/gdb/testsuite/gdb.base/corefile-exec-context.exp +++ b/gdb/testsuite/gdb.base/corefile-exec-context.exp @@ -69,7 +69,7 @@ gdb_test_multiple "core-file $corefile_1" "load core file no args" { } # Generate a core file, this time pass some arguments to the inferior. -set args "aaaaa bbbbb ccccc ddddd e\\\\ e\\\\ e\\\\ e\\\\ e" +set args {aaaaa bbbbb ccccc ddddd e\ e\ e\ e\ e} set corefile [core_find $binfile {} $args] if {$corefile == ""} { untested "unable to create corefile" @@ -82,8 +82,11 @@ remote_exec build "mv $corefile $corefile_2" # argument list are seen. clean_restart $testfile set saw_generated_line false +set re_args [string_to_regexp $args] +set re_cmd "[string_to_regexp $binfile] $re_args" +set re_line [subst_vars {^Core was generated by `$re_cmd'\.\r\n}] gdb_test_multiple "core-file $corefile_2" "load core file with args" { - -re "^Core was generated by `[string_to_regexp $binfile] $args'\\.\r\n" { + -re $re_line { set saw_generated_line true exp_continue } @@ -99,7 +102,8 @@ gdb_test_multiple "core-file $corefile_2" "load core file with args" { # Also, the argument list should be available through 'show args'. gdb_test "show args" \ - "Argument list to give program being debugged when it is started is \"$args\"\\." + [subst_vars \ + {Argument list to give program being debugged when it is started is "$re_args"\.}] # Move up to 'main'. Do it this way because we cannot know how many # frames up 'main' actually is. @@ -178,8 +182,9 @@ proc check_for_env_var { var_name var_value } { gdb_assert { ![check_for_env_var $env_var_name $env_var_value] } \ "environment variable is not set before core file load" +set re_cmd "[string_to_regexp $binfile] $re_args" gdb_test "core-file $corefile_3" \ - "Core was generated by `[string_to_regexp $binfile] $args'\\.\r\n.*" \ + [subst_vars {Core was generated by `$re_cmd'\.\r\n.*}] \ "load core file for environment test" gdb_assert { [check_for_env_var $env_var_name $env_var_value] } \ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 9ade9a16818..2cfdbdda09d 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -10312,8 +10312,18 @@ proc core_find {binfile {deletefiles {}} {arg ""} {output_file "/dev/null"}} { } } - # tclint-disable command-args - catch "system \"(cd ${coredir}; ulimit -c unlimited; $coredump_filter_cmd; ${binfile} ${arg}; true) >${output_file} 2>&1\"" + set cmd [subst_vars { + (cd ${coredir}; + ulimit -c unlimited; + $coredump_filter_cmd; + ${binfile} ${arg}; + true) \ + >${output_file} 2>&1}] + verbose -log "Executing on build: $cmd" + catch { + system $cmd + } + # remote_exec host "${binfile}" set binfile_basename [file tail $binfile] foreach i [list \ @@ -10343,8 +10353,16 @@ proc core_find {binfile {deletefiles {}} {arg ""} {output_file "/dev/null"}} { # ulimit here if we didn't find a core file above. # Oh, I should mention that any "braindamaged" non-Unix system has # the same problem. I like the cd bit too, it's really neat'n stuff. - # tclint-disable command-args - catch "system \"(cd ${objdir}/${subdir}; ${binfile}; true) >/dev/null 2>&1\"" + set cmd [subst_vars { + (cd ${objdir}/${subdir}; + ${binfile}; + true) \ + >/dev/null 2>&1}] + verbose -log "Executing on build: $cmd" + catch { + system $cmd + } + foreach i "${objdir}/${subdir}/core ${objdir}/${subdir}/core.coremaker.c ${binfile}.core" { if {[remote_file build exists $i]} { remote_exec build "mv $i $destcore" -- 2.51.0