From patchwork Mon Mar 25 08:56:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 87612 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EB1D2385840C for ; Mon, 25 Mar 2024 08:56:54 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org 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 DC6073858403 for ; Mon, 25 Mar 2024 08:56:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC6073858403 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 DC6073858403 Authentication-Results: server2.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=1711356989; cv=none; b=NJEuxIg55ciuVPJQK5erN87INkuADRhoglHSSWLya4wAJgCMHgkbE+nwa3HUgLxfaC7DDJYitBOZ1XJwBmmt5W+lEva2nhdoHWsaAoiiLLPM37LCIT0BJ4pjI170ZiK7bDyTakh36q/g5ileqGWQzCsyc5qkxJGSdGGhk/VQwLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711356989; c=relaxed/simple; bh=6EJZnVN1DiiJtDExfoQab6ds/ociaZl79Kw3csHCoQA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=cc3Ko//7yRUky8ioh25xUd5wx/i8fF3vbITKIH385rCcnRANq0d10NYa8yPwgrgonjzjO2expAoEKdRLWUmQGmKcp7Tphd1qlSaUyI6I5meAhHQc3YOzl34vuwrHEdW7BTHoKjOrCUxjOqsRX1G0UzWurWKoJrPjlmlO11fwv1A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 7AB5E34F8D; Mon, 25 Mar 2024 08:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711356986; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=i3c7TMZKkdXnP143w2Y0DERWHv8dkq5VCoUofDx6rrU=; b=QJpEcYxn3/4Lom/tKMmx4iU96DGU/K2hZFf2OB2u7Jm/qRZIXkHjGA1iU/+DXj2eKXYPpa zISL1Ahx4ZugUZAn9Cur6YpOOHJ/OXDB2sP/7UcPvadD5dpLfZeZ9yaoD4eezqEzYZIOwH /VQdKr0AhE/dWM+nvrhT+mX9hanQHQo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711356986; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=i3c7TMZKkdXnP143w2Y0DERWHv8dkq5VCoUofDx6rrU=; b=REqhEE0QP5rrAtifIF7A+LzD/RuaDF1Iy1XhGuCKXRZdJBP2D0GVcO8KwIS0XYEhjluiR2 i1Ui214HoWrLADCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711356986; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=i3c7TMZKkdXnP143w2Y0DERWHv8dkq5VCoUofDx6rrU=; b=QJpEcYxn3/4Lom/tKMmx4iU96DGU/K2hZFf2OB2u7Jm/qRZIXkHjGA1iU/+DXj2eKXYPpa zISL1Ahx4ZugUZAn9Cur6YpOOHJ/OXDB2sP/7UcPvadD5dpLfZeZ9yaoD4eezqEzYZIOwH /VQdKr0AhE/dWM+nvrhT+mX9hanQHQo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711356986; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=i3c7TMZKkdXnP143w2Y0DERWHv8dkq5VCoUofDx6rrU=; b=REqhEE0QP5rrAtifIF7A+LzD/RuaDF1Iy1XhGuCKXRZdJBP2D0GVcO8KwIS0XYEhjluiR2 i1Ui214HoWrLADCg== 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 60BF013503; Mon, 25 Mar 2024 08:56:26 +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 Cl5mFjo8AWZcJwAAD6G6ig (envelope-from ); Mon, 25 Mar 2024 08:56:26 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: John Baldwin Subject: [pushed] [gdb/testsuite] Fix tdlabel_re references Date: Mon, 25 Mar 2024 09:56:19 +0100 Message-Id: <20240325085619.16552-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: 0.70 X-Spamd-Result: default: False [0.70 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Level: Authentication-Results: smtp-out1.suse.de; none X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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+patchwork=sourceware.org@sourceware.org Commit 467a34bb9e6 ("gdb tests: Allow for "LWP" or "process" in thread IDs from info threads") introduces a new global variable tdlabel_re, but fails to indicate it's global when used in procs in four test-cases. Fix this by adding "global tdlabel_re". Tested on aarch64-linux. --- gdb/testsuite/gdb.multi/multi-target-thread-find.exp | 2 +- gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp | 2 +- gdb/testsuite/gdb.trace/report.exp | 2 ++ gdb/testsuite/gdb.trace/strace.exp | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) base-commit: 121a4d3d8025b8619c5b0e189040c47a7815a0f1 diff --git a/gdb/testsuite/gdb.multi/multi-target-thread-find.exp b/gdb/testsuite/gdb.multi/multi-target-thread-find.exp index ee6df54b411..24d19d5041e 100644 --- a/gdb/testsuite/gdb.multi/multi-target-thread-find.exp +++ b/gdb/testsuite/gdb.multi/multi-target-thread-find.exp @@ -23,7 +23,7 @@ if {![multi_target_prepare]} { } proc test_thread_find {} { - global decimal gdb_prompt + global decimal gdb_prompt tdlabel_re set NUM_INFS 6 diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp index bd1acda4d90..9d121c5f439 100644 --- a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp +++ b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp @@ -42,7 +42,7 @@ set target_binfile [gdb_remote_download target $binfile] # Run the tests with different features of GDBserver disabled. # TARGET_NON_STOP is passed to "maint set target-non-stop". proc run_test { target_non_stop disable_feature } { - global binfile gdb_prompt decimal hex + global binfile gdb_prompt decimal hex tdlabel_re global GDBFLAGS save_vars { GDBFLAGS } { diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp index a6e1650a02e..71465992778 100644 --- a/gdb/testsuite/gdb.trace/report.exp +++ b/gdb/testsuite/gdb.trace/report.exp @@ -173,6 +173,8 @@ gdb_test "help tdump" "Print everything collected at the current.*" \ # inferior and tfile. proc use_collected_data { data_source } { + global tdlabel_re + with_test_prefix "${data_source}" { global tdp1 tdp2 tdp3 tdp4 tdp5 tdp6 global testline1 testline2 testline3 testline4 testline5 testline6 diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp index 730acda6489..99b199ef5f1 100644 --- a/gdb/testsuite/gdb.trace/strace.exp +++ b/gdb/testsuite/gdb.trace/strace.exp @@ -124,6 +124,7 @@ proc strace_info_marker { } { global executable global gdb_prompt global libipa + global tdlabel_re # Restart with a fresh gdb. clean_restart $executable