From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id gMqxLE4lXmnPXTAAWB0awg (envelope-from ) for ; Wed, 07 Jan 2026 04:20:14 -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=AIGZMQVS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5Tteso1U; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=AIGZMQVS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5Tteso1U; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A872B1E0B6; Wed, 07 Jan 2026 04:20:14 -0500 (EST) 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 6FE401E048 for ; Wed, 07 Jan 2026 04:20:13 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id DE1F44BA2E22 for ; Wed, 7 Jan 2026 09:20:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE1F44BA2E22 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=AIGZMQVS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5Tteso1U; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=AIGZMQVS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5Tteso1U Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 620184BA2E21 for ; Wed, 7 Jan 2026 09:19:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 620184BA2E21 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 620184BA2E21 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1767777584; cv=none; b=OXxDM+3LCfZ5SAt9BH9gSeo6bnPIRSbbT7lUcms+sL5y6Hn5v8K7DVLD4cLLeGOCWBVJ6CTdWtIDcFBYgtb/8U38AkzjYngbm5t456HGOc3wxNEMQFZMUcPPf7MFmqc/lkFHjXn37I6Ye/1mS8eeL/VWlZeRtIHJ98kQSGzD1RA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1767777584; c=relaxed/simple; bh=FjrhKQV1M6RYLYzh7xVeF54t3jXss23+ZwbXHuhpXlE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=uiD8dd6UySR7Aj4sdUCl+/WUcB2MqtYyo0QBwigBoZ7d06KdKq/iTyHnGnAagDk/AAH4LWG93C/qBrqGJLxSAMIY/DNkuQN4dCOeIyLQmAxk3kYphcI1z76YNYlyi+D0O3339LcvevyCheDfUAmLrKGTi7TOPsAPXlepn0OE92M= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 620184BA2E21 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 25DB45BD1D for ; Wed, 7 Jan 2026 09:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1767777583; 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=FAzDmASxk7L/7DSukA3S/e5LTKEvbdHR6dY5p5125RQ=; b=AIGZMQVSvdJQVYFQ6QHZKPg+JQof/l6dsPImbXE+siTc/IQlJcA3Se2gy1Y29Ywb1Nx59X WsLD+bHlKToLe4AdYgk1e7jrfMjPwR1+R3hwJTMPcKz+M8sij6f1gkNcX6VG3izaSm2utK 0q1HDtiqFYhoCYeQ8j2leJXrTTQ6wIk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1767777583; 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=FAzDmASxk7L/7DSukA3S/e5LTKEvbdHR6dY5p5125RQ=; b=5Tteso1U/dQ8PqEI39Jb1UT1WRE69vaAHKfg5ynKmrfVCGek/Guv9tay78xpGMdhLbciWO TpWFypigauF56nBQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=AIGZMQVS; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=5Tteso1U DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1767777583; 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=FAzDmASxk7L/7DSukA3S/e5LTKEvbdHR6dY5p5125RQ=; b=AIGZMQVSvdJQVYFQ6QHZKPg+JQof/l6dsPImbXE+siTc/IQlJcA3Se2gy1Y29Ywb1Nx59X WsLD+bHlKToLe4AdYgk1e7jrfMjPwR1+R3hwJTMPcKz+M8sij6f1gkNcX6VG3izaSm2utK 0q1HDtiqFYhoCYeQ8j2leJXrTTQ6wIk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1767777583; 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=FAzDmASxk7L/7DSukA3S/e5LTKEvbdHR6dY5p5125RQ=; b=5Tteso1U/dQ8PqEI39Jb1UT1WRE69vaAHKfg5ynKmrfVCGek/Guv9tay78xpGMdhLbciWO TpWFypigauF56nBQ== 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 0D8AA3EA63 for ; Wed, 7 Jan 2026 09:19:43 +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 CAnfAS8lXmnSEwAAD6G6ig (envelope-from ) for ; Wed, 07 Jan 2026 09:19:43 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Fix timeouts in gdb.base/tls-dlobj.exp Date: Wed, 7 Jan 2026 10:19:42 +0100 Message-ID: <20260107091942.2506484-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 [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[-0.998]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid,sourceware.org:url,gdb.base:url]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 25DB45BD1D 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 the testsuite on a busy system, occasionally I run into timeouts in test-case gdb.base/tls-dlobj.exp (gdb build with -O0, as usual). When building gdb with Address Sanitizer (and still with -O0), I always run into timeouts, though it may differ where in the test-case. I can address this using with_timeout_factor, and the test-case finishes after a while without timeouts: ... real 2m30.139s user 2m32.834s sys 0m1.777s ... But the preferred way to deal with this is to cut up the long operation in smaller observable steps, each with their own timeout, so I tried out eliminating the use of continue in the test-case, and using next instead. In order not to spent too much time stepping through for loops like this: ... for (i = 1; i <= 4; i++) s0 (i, 10 + i); ... I rewrote those to a single line. With this new approach, I get instead: ... real 0m5.950s user 0m8.239s sys 0m1.318s ... I'm not sure why there's such a big difference in execution time, but the functionality of the test-case hasn't changed, so I'm assuming this is related to Address Sanitizer behavior. Tested on x86_64-linux. PR testsuite/33707 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33707 --- gdb/testsuite/gdb.base/tls-dlobj.c | 150 +++++++++------------------ gdb/testsuite/gdb.base/tls-dlobj.exp | 35 +++---- 2 files changed, 65 insertions(+), 120 deletions(-) diff --git a/gdb/testsuite/gdb.base/tls-dlobj.c b/gdb/testsuite/gdb.base/tls-dlobj.c index b6dc6e45e93..e99d7a590c1 100644 --- a/gdb/testsuite/gdb.base/tls-dlobj.c +++ b/gdb/testsuite/gdb.base/tls-dlobj.c @@ -99,20 +99,13 @@ main (int argc, char **argv) use_it (0); /* main-breakpoint-1 */ /* Set TLS variables in main program and all libraries. */ - for (i = 1; i <= 4; i++) - s0 (i, 10 + i); - for (i = 1; i <= 4; i++) - s1 (i, 110 + i); - for (i = 1; i <= 4; i++) - s2 (i, 210 + i); - for (i = 1; i <= 4; i++) - s3 (i, 310 + i); - for (i = 1; i <= 4; i++) - s4 (i, 410 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1010 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1110 + i); + for (i = 1; i <= 4; i++) s0 (i, 10 + i); + for (i = 1; i <= 4; i++) s1 (i, 110 + i); + for (i = 1; i <= 4; i++) s2 (i, 210 + i); + for (i = 1; i <= 4; i++) s3 (i, 310 + i); + for (i = 1; i <= 4; i++) s4 (i, 410 + i); + for (i = 1; i <= 4; i++) s10 (i, 1010 + i); + for (i = 1; i <= 4; i++) s11 (i, 1110 + i); use_it (0); /* main-breakpoint-2 */ @@ -124,16 +117,11 @@ main (int argc, char **argv) /* Set TLS variables in main program and in libraries which are still loaded. */ - for (i = 1; i <= 4; i++) - s0 (i, 20 + i); - for (i = 1; i <= 4; i++) - s1 (i, 120 + i); - for (i = 1; i <= 4; i++) - s4 (i, 420 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1020 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1120 + i); + for (i = 1; i <= 4; i++) s0 (i, 20 + i); + for (i = 1; i <= 4; i++) s1 (i, 120 + i); + for (i = 1; i <= 4; i++) s4 (i, 420 + i); + for (i = 1; i <= 4; i++) s10 (i, 1020 + i); + for (i = 1; i <= 4; i++) s11 (i, 1120 + i); use_it (0); /* main-breakpoint-3 */ @@ -141,18 +129,12 @@ main (int argc, char **argv) h3 = load_dso (OBJ3, 3, &s3); /* Set TLS vars again; currently, only lib2 is not loaded. */ - for (i = 1; i <= 4; i++) - s0 (i, 30 + i); - for (i = 1; i <= 4; i++) - s1 (i, 130 + i); - for (i = 1; i <= 4; i++) - s3 (i, 330 + i); - for (i = 1; i <= 4; i++) - s4 (i, 430 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1030 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1130 + i); + for (i = 1; i <= 4; i++) s0 (i, 30 + i); + for (i = 1; i <= 4; i++) s1 (i, 130 + i); + for (i = 1; i <= 4; i++) s3 (i, 330 + i); + for (i = 1; i <= 4; i++) s4 (i, 430 + i); + for (i = 1; i <= 4; i++) s10 (i, 1030 + i); + for (i = 1; i <= 4; i++) s11 (i, 1130 + i); use_it (0); /* main-breakpoint-4 */ @@ -165,16 +147,11 @@ main (int argc, char **argv) /* Set TLS vars; currently, lib2 and lib3 are loaded, lib1 and lib4 are not. */ - for (i = 1; i <= 4; i++) - s0 (i, 40 + i); - for (i = 1; i <= 4; i++) - s2 (i, 240 + i); - for (i = 1; i <= 4; i++) - s3 (i, 340 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1040 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1140 + i); + for (i = 1; i <= 4; i++) s0 (i, 40 + i); + for (i = 1; i <= 4; i++) s2 (i, 240 + i); + for (i = 1; i <= 4; i++) s3 (i, 340 + i); + for (i = 1; i <= 4; i++) s10 (i, 1040 + i); + for (i = 1; i <= 4; i++) s11 (i, 1140 + i); use_it (0); /* main-breakpoint-5 */ @@ -186,18 +163,12 @@ main (int argc, char **argv) /* Set TLS vars; currently, lib1, lib3, and lib4 are loaded; lib2 is not loaded. */ - for (i = 1; i <= 4; i++) - s0 (i, 50 + i); - for (i = 1; i <= 4; i++) - s1 (i, 150 + i); - for (i = 1; i <= 4; i++) - s3 (i, 350 + i); - for (i = 1; i <= 4; i++) - s4 (i, 450 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1050 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1150 + i); + for (i = 1; i <= 4; i++) s0 (i, 50 + i); + for (i = 1; i <= 4; i++) s1 (i, 150 + i); + for (i = 1; i <= 4; i++) s3 (i, 350 + i); + for (i = 1; i <= 4; i++) s4 (i, 450 + i); + for (i = 1; i <= 4; i++) s10 (i, 1050 + i); + for (i = 1; i <= 4; i++) s11 (i, 1150 + i); use_it (0); /* main-breakpoint-6 */ @@ -213,16 +184,11 @@ main (int argc, char **argv) /* Set TLS vars; currently, lib2 and lib3 are loaded; lib1 and lib4 are not loaded. */ - for (i = 1; i <= 4; i++) - s0 (i, 60 + i); - for (i = 1; i <= 4; i++) - s2 (i, 260 + i); - for (i = 1; i <= 4; i++) - s3 (i, 360 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1060 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1160 + i); + for (i = 1; i <= 4; i++) s0 (i, 60 + i); + for (i = 1; i <= 4; i++) s2 (i, 260 + i); + for (i = 1; i <= 4; i++) s3 (i, 360 + i); + for (i = 1; i <= 4; i++) s10 (i, 1060 + i); + for (i = 1; i <= 4; i++) s11 (i, 1160 + i); use_it (0); /* main-breakpoint-7 */ @@ -239,20 +205,13 @@ main (int argc, char **argv) /* Set TLS vars; currently, lib1, lib2, lib3, and lib4 are all loaded. */ - for (i = 1; i <= 4; i++) - s0 (i, 70 + i); - for (i = 1; i <= 4; i++) - s1 (i, 170 + i); - for (i = 1; i <= 4; i++) - s2 (i, 270 + i); - for (i = 1; i <= 4; i++) - s3 (i, 370 + i); - for (i = 1; i <= 4; i++) - s4 (i, 470 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1070 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1170 + i); + for (i = 1; i <= 4; i++) s0 (i, 70 + i); + for (i = 1; i <= 4; i++) s1 (i, 170 + i); + for (i = 1; i <= 4; i++) s2 (i, 270 + i); + for (i = 1; i <= 4; i++) s3 (i, 370 + i); + for (i = 1; i <= 4; i++) s4 (i, 470 + i); + for (i = 1; i <= 4; i++) s10 (i, 1070 + i); + for (i = 1; i <= 4; i++) s11 (i, 1170 + i); use_it (0); /* main-breakpoint-8 */ @@ -266,14 +225,10 @@ main (int argc, char **argv) /* Set TLS vars; currently, lib2 is loaded; lib1, lib3, and lib4 are not. */ - for (i = 1; i <= 4; i++) - s0 (i, 80 + i); - for (i = 1; i <= 4; i++) - s2 (i, 280 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1080 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1180 + i); + for (i = 1; i <= 4; i++) s0 (i, 80 + i); + for (i = 1; i <= 4; i++) s2 (i, 280 + i); + for (i = 1; i <= 4; i++) s10 (i, 1080 + i); + for (i = 1; i <= 4; i++) s11 (i, 1180 + i); use_it (0); /* main-breakpoint-9 */ @@ -285,16 +240,11 @@ main (int argc, char **argv) /* Set TLS vars; currently, lib3 and lib4 are loaded; lib1 and lib2 are not. */ - for (i = 1; i <= 4; i++) - s0 (i, 90 + i); - for (i = 1; i <= 4; i++) - s3 (i, 390 + i); - for (i = 1; i <= 4; i++) - s4 (i, 490 + i); - for (i = 1; i <= 4; i++) - s10 (i, 1090 + i); - for (i = 1; i <= 4; i++) - s11 (i, 1190 + i); + for (i = 1; i <= 4; i++) s0 (i, 90 + i); + for (i = 1; i <= 4; i++) s3 (i, 390 + i); + for (i = 1; i <= 4; i++) s4 (i, 490 + i); + for (i = 1; i <= 4; i++) s10 (i, 1090 + i); + for (i = 1; i <= 4; i++) s11 (i, 1190 + i); use_it (0); /* main-breakpoint-10 */ diff --git a/gdb/testsuite/gdb.base/tls-dlobj.exp b/gdb/testsuite/gdb.base/tls-dlobj.exp index 68c8b781473..0b8cb35aa7d 100644 --- a/gdb/testsuite/gdb.base/tls-dlobj.exp +++ b/gdb/testsuite/gdb.base/tls-dlobj.exp @@ -55,6 +55,11 @@ proc gdb_test_with_xfail { cmd re cond} { } } +proc next_to_main_breakpoint { n } { + repeat_cmd_until next "" main-breakpoint-$n \ + "step to breakpoint: main-breakpoint-$n" 20 +} + proc do_tests {force_internal_tls} { clean_restart $::testfile if {![runto_main]} { @@ -65,8 +70,7 @@ proc do_tests {force_internal_tls} { gdb_test_no_output "maint set force-internal-tls-address-lookup on" } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-1"] - gdb_continue_to_breakpoint "main-breakpoint-1" + next_to_main_breakpoint 1 with_test_prefix "before assignments" { gdb_test "print tls_main_tbss_1" ".* = 0" @@ -100,8 +104,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-2"] - gdb_continue_to_breakpoint "main-breakpoint-2" + next_to_main_breakpoint 2 with_test_prefix "at main-breakpoint-2" { gdb_test "print tls_main_tbss_1" ".* = 11" @@ -117,8 +120,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-3"] - gdb_continue_to_breakpoint "main-breakpoint-3" + next_to_main_breakpoint 3 # At this point lib2 and lib3 have been unloaded. Also, TLS vars # in remaining libraries have been changed. @@ -137,8 +139,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-4"] - gdb_continue_to_breakpoint "main-breakpoint-4" + next_to_main_breakpoint 4 # lib3 has been loaded again; lib2 is the only one not loaded. @@ -157,8 +158,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-5"] - gdb_continue_to_breakpoint "main-breakpoint-5" + next_to_main_breakpoint 5 # lib2 and lib3 are loaded; lib1 and lib4 are not. @@ -177,8 +177,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-6"] - gdb_continue_to_breakpoint "main-breakpoint-6" + next_to_main_breakpoint 6 # lib1, lib3 and lib4 are loaded; lib2 is not loaded. @@ -197,8 +196,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-7"] - gdb_continue_to_breakpoint "main-breakpoint-7" + next_to_main_breakpoint 7 # lib2 and lib3 are loaded; lib1 and lib4 are not. @@ -217,8 +215,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-8"] - gdb_continue_to_breakpoint "main-breakpoint-8" + next_to_main_breakpoint 8 # lib1, lib2, lib3, and lib4 are all loaded. @@ -236,8 +233,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-9"] - gdb_continue_to_breakpoint "main-breakpoint-9" + next_to_main_breakpoint 9 # lib2 is loaded; lib1, lib3, and lib4 are not. @@ -255,8 +251,7 @@ proc do_tests {force_internal_tls} { } } - gdb_breakpoint [gdb_get_line_number "main-breakpoint-10"] - gdb_continue_to_breakpoint "main-breakpoint-10" + next_to_main_breakpoint 10 # lib3 and lib4 are loaded; lib1 and lib2 are not. base-commit: fc9bd3b1baffa2af37d494751012d25618fdede5 -- 2.51.0