diff mbox series

[pushed,gdb/testsuite] Fix tdlabel_re references

Message ID 20240325085619.16552-1-tdevries@suse.de
State Committed
Headers
Series [pushed,gdb/testsuite] Fix tdlabel_re references |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_gdb_build--master-arm fail Patch failed to apply

Commit Message

Tom de Vries March 25, 2024, 8:56 a.m. UTC 
  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

Comments

John Baldwin March 25, 2024, 4:31 p.m. UTC | #1 
On 3/25/24 1:56 AM, Tom de Vries wrote:
> 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".

Ouch, thanks for fixing.  Not sure why my local testing didn't see this. :(
diff mbox series

Patch

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