From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id iWQEGKmB4moqLQUAWB0awg (envelope-from ) for ; Wed, 28 Oct 2026 19:13:45 -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=pP74XvYo; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=orqAeEzt; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=pP74XvYo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=orqAeEzt; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 4C6261E007; Wed, 28 Oct 2026 19:13:45 -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 A128F1E007 for ; Wed, 28 Oct 2026 19:13:43 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9B4E74BA2E20 for ; Wed, 28 Oct 2026 23:13:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B4E74BA2E20 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=pP74XvYo; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=orqAeEzt; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=pP74XvYo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=orqAeEzt 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 8DB1C4BA2E30 for ; Wed, 28 Oct 2026 23:13:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8DB1C4BA2E30 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 8DB1C4BA2E30 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=1793229195; cv=none; b=B9lVHIT7GQ/usRjdbc8HvROpW6ZZMBHs/xSo/eu40XFcs3xhE9Phq03lPWJuzEct+6Gf2dMjfqIlIHM9I0Rc2ybOM0LV+g7DdYKho6pNJ1kFM5lWnD37oYMAA3CrjcACWgr56naZvhNL+fLICgKA2IVR0KToMMiRsJlm82s9YJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1793229195; c=relaxed/simple; bh=iMFz0iV/88+cWh17IjAQpWVc9bouUZj//PpC2foIfL4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=Of8I1J1LOWeMNTlHKDjeyI+6VH/aw83NUA2eb8vtmVkP6XiS0mAi1N/B0aKN/+bgBlFNylx9Mohif06LbPkI/TC8pU6nyxN4rOKaaslo5SFzR5Aczm61PEHcGMQFsa3wbRUCI+3PPRXSSb5AfheZNSGvLtZkjy7ee+dimfnM9b8= 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=pP74XvYo; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=orqAeEzt; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=pP74XvYo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=orqAeEzt DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DB1C4BA2E30 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-out2.suse.de (Postfix) with ESMTPS id 19DA51FB75 for ; Wed, 28 Oct 2026 23:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1793229194; 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=GZkNT3/P9ilAQAenRvqLgwyxUnN2mtGSsa1rztWRQW0=; b=pP74XvYoJ5a7/lO/zN63fibDzqAoPxgeCeBKQ4Syg3k3rjyGnSZ/b8PuznSXwfQ7B3rc+G eLuDjjLYXBe2HX9hIburKcSWQMDzdosV8JhAhOAZL41iy3AqPD3HIYuKu2UeX73A7Y4fN2 In1U2dTxWOnGXbycWZYojZciqfTRDbo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1793229194; 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=GZkNT3/P9ilAQAenRvqLgwyxUnN2mtGSsa1rztWRQW0=; b=orqAeEztcxOYxHy8HxhlwmXd4LcCmWDdUERPIUFMgruwgED2NTr6BgJMsQtPXW4HapyRo0 EkO18xvWNa1hmqDA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1793229194; 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=GZkNT3/P9ilAQAenRvqLgwyxUnN2mtGSsa1rztWRQW0=; b=pP74XvYoJ5a7/lO/zN63fibDzqAoPxgeCeBKQ4Syg3k3rjyGnSZ/b8PuznSXwfQ7B3rc+G eLuDjjLYXBe2HX9hIburKcSWQMDzdosV8JhAhOAZL41iy3AqPD3HIYuKu2UeX73A7Y4fN2 In1U2dTxWOnGXbycWZYojZciqfTRDbo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1793229194; 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=GZkNT3/P9ilAQAenRvqLgwyxUnN2mtGSsa1rztWRQW0=; b=orqAeEztcxOYxHy8HxhlwmXd4LcCmWDdUERPIUFMgruwgED2NTr6BgJMsQtPXW4HapyRo0 EkO18xvWNa1hmqDA== 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 DA39513419 for ; Wed, 28 Oct 2026 23:13:13 +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 6EChK4mB4moaFAAAD6G6ig (envelope-from ) for ; Wed, 28 Oct 2026 23:13:13 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Fix gdb.mi/pr11022.exp on big endian Date: Thu, 29 Oct 2026 00:13:13 +0100 Message-ID: <20261028231313.1835272-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 [-11.80 / 50.00]; SUSE_INTERNAL_BYPASS(-9.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)[-1.000]; 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]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,gnu.org:url]; 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)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; 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 On s390x-linux, with test-case gdb.mi/pr11022.exp I run into: ... FAIL: $exp: data-write-memory-bytes &x "01": \ watchpoint hit 2 (unknown output after running) ... The problem is that we're writing a byte to the start address of an int, which gets different results on big and little endian. Fix this by writing to an int8_t instead. Likewise, make sure that the 4-byte write writes to a 4-byte int by using int32_t instead of int. While we're at it, reduce unnecessary escaping. Tested on x86_64-linux and s390x-linux. --- gdb/testsuite/gdb.mi/pr11022.c | 7 +++++-- gdb/testsuite/gdb.mi/pr11022.exp | 31 ++++++++++++++++++++----------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/gdb.mi/pr11022.c b/gdb/testsuite/gdb.mi/pr11022.c index 676506c2849..240f50b8750 100644 --- a/gdb/testsuite/gdb.mi/pr11022.c +++ b/gdb/testsuite/gdb.mi/pr11022.c @@ -15,7 +15,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -int x; +#include + +int32_t x; +int8_t b; int main () @@ -24,7 +27,7 @@ main () for (i = 0; i < 500; ++i) { j = 0; /* break here */ - x = 42; + x = b = 42; j = i; /* expect HW watchpoint stop */ } return 0; diff --git a/gdb/testsuite/gdb.mi/pr11022.exp b/gdb/testsuite/gdb.mi/pr11022.exp index 35e31af95b1..b72db25a270 100644 --- a/gdb/testsuite/gdb.mi/pr11022.exp +++ b/gdb/testsuite/gdb.mi/pr11022.exp @@ -25,7 +25,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb return } -proc test_memory_changed_observer { mi_command } { +proc test_memory_changed_observer { var mi_command } { with_test_prefix "${mi_command}" { global srcfile binfile @@ -37,29 +37,38 @@ proc test_memory_changed_observer { mi_command } { {\^done,bkpt=.number="2",type="breakpoint".*\}} \ "set breakpoint" - mi_gdb_test "watch x" ".*" "set watchpoint" + mi_gdb_test "watch $var" ".*" "set watchpoint" mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*" ".*" \ - { "" "disp=\"keep\"" } "breakpoint hit" + { "" {disp="keep"} } "breakpoint hit" + + set re_0 {0( '[^\r\n]*')?} + set re_1 {1( '[^\r\n]*')?} + set re_42 {42( '[^\r\n]*')?} mi_execute_to "exec-continue" "watchpoint-trigger" "main" "" ".*" ".*" \ - { "" "wpt=\{number=\"3\",exp=\"x\"\},value=\{old=\"0\",new=\"42\"\}" } \ + [list \ + "" \ + [subst_vars \ + {wpt={number="3",exp="$var"},value={old="$re_0",new="$re_42"}}]] \ "watchpoint hit" mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*" ".*" \ - { "" "disp=\"keep\"" } "breakpoint hit 2" + { "" {disp="keep"} } "breakpoint hit 2" - mi_gdb_test "-${mi_command}" {\^done} "set x" + mi_gdb_test "-${mi_command}" {\^done} "set $var" mi_execute_to "exec-continue" "watchpoint-trigger" "main" "" ".*" ".*" \ - { "" "wpt=\{number=\"3\",exp=\"x\"\},value=\{old=\"1\",new=\"42\"\}" } \ + [list \ + "" \ + [subst_vars \ + {wpt={number="3",exp="$var"},value={old="$re_1",new="$re_42"}}]] \ "watchpoint hit 2" mi_gdb_exit } } -test_memory_changed_observer "data-write-memory-bytes &x \"01\"" -# We want to trigger a target memory write here, so the word size (4 or 8) -# is not that important. -test_memory_changed_observer "data-write-memory &x x 4 \"01\"" +test_memory_changed_observer b {data-write-memory-bytes &b "01"} + +test_memory_changed_observer x {data-write-memory &x x 4 "01"} base-commit: aeed64b39aed57729f66ad51560d8964e8201e6e -- 2.51.0