From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id jlfBE+eRmmr7/ScAWB0awg (envelope-from ) for ; Fri, 04 Sep 2026 05:39:51 -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=rC0Arcrr; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1EcCD6AS; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1dcu1fak; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XqRjCfIX; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2F98E1E09B; Fri, 04 Sep 2026 05:39:51 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) 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.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::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 584281E09B for ; Fri, 04 Sep 2026 05:39:49 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 990864A9BE5C for ; Fri, 4 Sep 2026 09:39:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 990864A9BE5C 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=rC0Arcrr; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1EcCD6AS; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1dcu1fak; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XqRjCfIX 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 5CF914A9BE66 for ; Fri, 4 Sep 2026 09:39:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5CF914A9BE66 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 5CF914A9BE66 Authentication-Results: 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=1788514749; cv=none; b=LmEOtyg2SqSXDRI4pjgxGTP9Da1FEgIAesqu/hp0u8tsTYaiI7AEij6H8MWgYAupM3/HDSqRWrkdUXbpVqRSEINQ594JmdUaLB7NDdGfA9v+xIVkVZPYoPbzqvrom+ARwjYK8gAdzL0S5UlAVCFgt1Owt/ir46OM9eyJtopmV+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1788514749; c=relaxed/simple; bh=jPYad3y8EBeUkhKqlm1A3iZM6i2H1khJ1mQgibassb8=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=ARCFmcjj6qbehpUG8YYjbJLGJqGm+ytnhVU1/R+92RjDgkXn/yUf16feM5h6tjVbBR0jZOGGt1zi8gdhu2e3GAgZedLbBNexk62vxUXcsoIoKc44x/sdHM2SKwI6lpnX9ijHbeXPzSCW0sFfYTnGcMxtQsUH9p7b7mShF3Sioo0= 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=rC0Arcrr; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1EcCD6AS; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1dcu1fak; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XqRjCfIX DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CF914A9BE66 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 B0F661F7AB for ; Fri, 4 Sep 2026 09:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788514743; 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=kWC3nPD3kD+CrDx7Z61cz0W9o7CBY2n4Tvz6YKV/+aI=; b=rC0ArcrreoNuOY3DxGbSmCU/FWKAdb8fWwVjalOtGTZG2wfky00xQhul4sH8XbJtOmgwyx cmmS1i8AQxbDdN0KCg6vSZd/zIpQE/438jAIkKsc9X/Lqg3ui804nkIOHNNoyxVhMxaGel EihPfzjQ6TKisluaH+Z53ZKTQ62zXmY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788514743; 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=kWC3nPD3kD+CrDx7Z61cz0W9o7CBY2n4Tvz6YKV/+aI=; b=1EcCD6AS/kHB3hKQGMHd73fiJpOgklgUa2mZ/RrVw/yiE/0DJPuXajN8zIcDr5xTbVZBnZ Xx1aoN8YV5zxZNAw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=1dcu1fak; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=XqRjCfIX DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788514739; 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=kWC3nPD3kD+CrDx7Z61cz0W9o7CBY2n4Tvz6YKV/+aI=; b=1dcu1fakVsDu7nPcdf9iTXYCDoydEOlArKJysNcTqXaJNaLCv63BEa/A4EUR2AWZIHQHuL CIC55OdmVW3xL/qZkQUFr+86tuiEG9g4gaZBjcL2FAeXjKDTEWsr4jtdHdFVO3ege9Lzhm 7cy2W7m65uA7k8rlSVHk7/WAL+A6p6Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788514739; 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=kWC3nPD3kD+CrDx7Z61cz0W9o7CBY2n4Tvz6YKV/+aI=; b=XqRjCfIX4Fhv47s/D4wy7A7vUL1b2PrBY73Wn7Rpgi6Jr70JFN6OSalPJMgb4G0zHaRXW+ rltNy6BXbDRMC0CQ== 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 5798513726 for ; Fri, 4 Sep 2026 09:38:59 +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 UOf/E7ORmmqyFQAAD6G6ig (envelope-from ) for ; Fri, 04 Sep 2026 09:38:59 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [RFC 2/5] [gdb/testsuite] Make lib/gdb.exp emacs indent compatible Date: Fri, 4 Sep 2026 11:38:52 +0200 Message-ID: <20260904093858.359604-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260904093858.359604-1-tdevries@suse.de> References: <20260904093858.359604-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B0F661F7AB X-Rspamd-Server: rspamd1.dmz-prg2.suse.org 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)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] 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 There are cases in gdb/testsuite/lib/gdb.exp where we have inline C sources. Say we start out by writing something like this: ... set src { int main (int argc) { if (argc == 3) return 0; } } ... When editing with emacs, and using tcl-mode, auto indent will change this to: ... set src { int main (int argc) { if (argc == 3) return 0; } } ... The 2 vs 4 spacing is fine, but removing indentation is not. We can fix this by adding braces: ... set src { int main (int argc) { if (argc == 3) { return 0; } } } ... But that approach breaks down when we have a for loop. Auto indent gives us: ... set src { int main (int argc) { for (int i = 0; i < 1) { argc++; } return argc; } } ... This can be fixed with a trick: adding an if: ... set src { int main (int argc) { for (int i = 0; i < 1) if (1) { argc++; } return argc; } } ... Use these methods to make the inline sources in lib/gdb.exp compatible with emacs auto indent. Note: this does not yet use emacs indentation. --- gdb/testsuite/lib/gdb.exp | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index ea8bffc9e89..d4a471ff7c4 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3134,6 +3134,9 @@ gdb_caching_proc allow_dlmopen_tests {} { return 42; } } + + # Note: we use a "for ... if (1) ..." trick to make emacs tcl-mode indent + # the for loop as if it was an if. set src { #define _GNU_SOURCE #include @@ -3155,9 +3158,11 @@ gdb_caching_proc allow_dlmopen_tests {} { r_debug = 0; /* Taken from /usr/include/link.h. */ - for (dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) - if (dyn->d_tag == DT_DEBUG) + for (dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) if (1) { + if (dyn->d_tag == DT_DEBUG) { r_debug = (struct r_debug *) dyn->d_un.d_ptr; + } + } if (!r_debug) { printf ("r_debug not found.\n"); @@ -11487,14 +11492,16 @@ gdb_caching_proc have_avx {} { int main() { unsigned int eax, ebx, ecx, edx; - if (!x86_cpuid (1, &eax, &ebx, &ecx, &edx)) + if (!x86_cpuid (1, &eax, &ebx, &ecx, &edx)) { return 0; + } - if ((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE)) + if ((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE)) { return 1; - else + } else { return 0; } + } } set compile_flags "incdir=${srcdir}/.." if {![gdb_simple_compile $me $src executable $compile_flags]} { @@ -11532,14 +11539,16 @@ gdb_caching_proc have_avx2 {} { int main() { unsigned int eax, ebx, ecx, edx; - if (!x86_cpuid_count (7, 0, &eax, &ebx, &ecx, &edx)) - return 0; + if (!x86_cpuid_count (7, 0, &eax, &ebx, &ecx, &edx)) { + return 0; + } - if ((ebx & bit_AVX2) == bit_AVX2) + if ((ebx & bit_AVX2) == bit_AVX2) { return 1; - else + } else { return 0; } + } } set compile_flags "incdir=${srcdir}/.." if {![gdb_simple_compile $me $src executable $compile_flags]} { @@ -11642,8 +11651,9 @@ gdb_caching_proc has_hw_wp_support {} { int main (void) { volatile int local; local = 1; - if (local == 1) + if (local == 1) { return 1; + } return 0; } } -- 2.51.0