From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id jjhlOdNgmmonqycAWB0awg (envelope-from ) for ; Fri, 04 Sep 2026 02:10:27 -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=tTv/gCGK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=g2z+yPtG; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=cWJC5e13; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=CkS7cD9p; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id D53A21E09B; Fri, 04 Sep 2026 02:10:27 -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 256831E09B for ; Fri, 04 Sep 2026 02:10:26 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 93F614BB3B94 for ; Fri, 4 Sep 2026 06:10:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93F614BB3B94 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=tTv/gCGK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=g2z+yPtG; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=cWJC5e13; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=CkS7cD9p Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id BAF9B4BB1C3F for ; Fri, 4 Sep 2026 06:10:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BAF9B4BB1C3F 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 BAF9B4BB1C3F Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1788502200; cv=none; b=n51NslNgUJsevwvXyfyZ5Qi7h5/xyDJ2GZWj2GnUmMZonCG264vcxClruuZ6XzGJmeyIJ5/FLaLBICTiVkdppjY2FeJ5XVP9DITTa/qVsaob1KV41ZExBwncvDVRsa/XtoDIS68qQSOxfxempU+XRwdzsLKmBRJpKnsvJcwOGoA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1788502200; c=relaxed/simple; bh=SMwUxET7j6Am7x1EccynT4JhS0wTSJYIJkKpLY+JzKs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=dRXrLG/8lKNHsW3MnkANneeMzCwu6I/oWynHsYQSWEjOti43k6pJwTzDlbjO/jjRQVBs9zfRNjVQ/rI6dsm7c736xkDeLwasV20CRQ9CEmU8v+yEZO3Shv6zKxhH6e7ovfvcQCRQvA642MkciOM8rbnmsq952wn7bSdcarRRjBY= 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=tTv/gCGK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=g2z+yPtG; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=cWJC5e13; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=CkS7cD9p DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAF9B4BB1C3F 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 1A08F22AEE for ; Fri, 4 Sep 2026 06:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788502195; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vU/qT+ke0UfyUGGzmrD02+zZYL4QmXmbFPbx1nH+rfI=; b=tTv/gCGKjwZn9nJ329eWNBhtsCNS0vwJiSheI6MbaGip2gWWklTGu4tlJ3+twn+6POaCKz BoG0zpWlTP8NYqXSmaG4Q35m5hhAwrOclpE/AJITESjDdWevElUSkG/W7uEBB7sM3FAljJ MPTiPXf4P+KCOkNuD3W0swAM5li+a8U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788502195; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vU/qT+ke0UfyUGGzmrD02+zZYL4QmXmbFPbx1nH+rfI=; b=g2z+yPtGdQS8im12h4oQeW1VngNZ7GspjHXMCEbhDUJ1P4jEHE5Zqmbh25ouB0YKntWjuQ fRkHcwiwIXAGtiCg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788502191; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vU/qT+ke0UfyUGGzmrD02+zZYL4QmXmbFPbx1nH+rfI=; b=cWJC5e13tmU0RDq9ERgsWY1CmMvP3P0Pui9TJyZXurSegxqTixHtB7GPVi9tyFlQqsLrA4 7Np0aG58LFtpj7gcOSPp5Y6cAoC7W4GJLmDW1hhGhIQns2XA3WcI/bhXXbrtgWqIDCG25u J5sT0dRd7RDXm6nqJlv03DLbfRvFoVs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788502191; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vU/qT+ke0UfyUGGzmrD02+zZYL4QmXmbFPbx1nH+rfI=; b=CkS7cD9pFs2V3wQplOvJW1OOJBNsAH+18fER8lEs2WOTe+NcMRSksntnQAKCUlatuJewfv qvK5g5B1gjgdNUDg== 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 BCCC113678 for ; Fri, 4 Sep 2026 06:09:50 +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 Mq5HLK5gmmq1PgAAD6G6ig (envelope-from ) for ; Fri, 04 Sep 2026 06:09:50 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Use multi_line more often Date: Fri, 4 Sep 2026 08:09:50 +0200 Message-ID: <20260904060950.32658-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 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.996]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; 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)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; 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 I came across two test-cases using [join $list "\r\n"]. Use multi_line for this. While we're at it, simplify the lists using quotemeta. --- gdb/testsuite/gdb.ada/task_watch.exp | 26 ++++++++++++++------------ gdb/testsuite/gdb.ada/tasks.exp | 26 ++++++++++++++------------ 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/gdb/testsuite/gdb.ada/task_watch.exp b/gdb/testsuite/gdb.ada/task_watch.exp index 7031abf41ff..06fc7af9db7 100644 --- a/gdb/testsuite/gdb.ada/task_watch.exp +++ b/gdb/testsuite/gdb.ada/task_watch.exp @@ -35,12 +35,13 @@ runto "foo.adb:$bp_location" # Make sure that all tasks appear in the "info tasks" listing, and # that the active task is the environment task. gdb_test "info tasks" \ - [join {" +ID +TID P-ID Pri State +Name" \ - "\\* +1 .* main_task" \ - " +2 .* task_list\\(1\\)" \ - " +3 .* task_list\\(2\\)" \ - " +4 .* task_list\\(3\\)"} \ - "\r\n"] \ + [quotemeta \ + [multi_line \ + " ID TID P-ID Pri State Name" \ + "* 1 @... main_task" \ + " 2 @... task_list(1)" \ + " 3 @... task_list(2)" \ + " 4 @... task_list(3)"]] \ "info tasks before inserting breakpoint" # Insert a watchpoint that should stop only if task 3 stops, and @@ -69,12 +70,13 @@ gdb_test "continue" \ # Check that it is indeed task 3 that hit the watchpoint by checking # which is the active task. gdb_test "info tasks" \ - [join {" +ID +TID P-ID Pri State +Name" \ - " +1 .* main_task" \ - " +2 .* task_list\\(1\\)" \ - "\\* +3 .* task_list\\(2\\)" \ - " +4 .* task_list\\(3\\)"} \ - "\r\n"] \ + [quotemeta \ + [multi_line \ + " ID TID P-ID Pri State Name" \ + " 1 @... main_task" \ + " 2 @... task_list(1)" \ + "* 3 @... task_list(2)" \ + " 4 @... task_list(3)"]] \ "info tasks after hitting watchpoint" # Now, resume the execution and make sure that GDB does not stop when diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp index b37cf0cadd1..c445b3ac402 100644 --- a/gdb/testsuite/gdb.ada/tasks.exp +++ b/gdb/testsuite/gdb.ada/tasks.exp @@ -33,12 +33,13 @@ runto "foo.adb:$bp_location" # Make sure that all tasks appear in the "info tasks" listing, and # that the active task is the environment task. gdb_test "info tasks" \ - [join {" +ID +TID P-ID Pri State +Name" \ - "\\* +1 .* main_task" \ - " +2 .* task_list\\(1\\)" \ - " +3 .* task_list\\(2\\)" \ - " +4 .* task_list\\(3\\)"} \ - "\r\n"] \ + [quotemeta \ + [multi_line \ + " ID TID P-ID Pri State Name" \ + "* 1 @... main_task" \ + " 2 @... task_list(1)" \ + " 3 @... task_list(2)" \ + " 4 @... task_list(3)"]] \ "info tasks before inserting breakpoint" # Confirm that the "info threads" output lines up with the tasks list. @@ -165,12 +166,13 @@ gdb_test "continue" \ # Check that it is indeed task 3 that hit the breakpoint by checking # which is the active task. gdb_test "info tasks" \ - [join {" +ID +TID P-ID Pri State +Name" \ - " +1 .* main_task" \ - " +2 .* task_list\\(1\\)" \ - "\\* +3 .* task_list\\(2\\)" \ - " +4 .* task_list\\(3\\)"} \ - "\r\n"] \ + [quotemeta \ + [multi_line \ + " ID TID P-ID Pri State Name" \ + " 1 @... main_task" \ + " 2 @... task_list(1)" \ + "* 3 @... task_list(2)" \ + " 4 @... task_list(3)"]] \ "info tasks after hitting breakpoint" # Now, resume the execution and make sure that GDB does not stop when base-commit: 265b8b7b1edb2da885396e89f03acb5d5e2c6832 -- 2.51.0