* [pushed] gdb/testsuite: use with_timeout_factor in 2 more tests
@ 2026-10-06 12:50 Jan Vrany
0 siblings, 0 replies; only message in thread
From: Jan Vrany @ 2026-10-06 12:50 UTC (permalink / raw)
To: gdb-patches; +Cc: Jan Vrany, Simon Marchi
From: Jan Vrany <jan.vrany@labware.com>
When running tests on some really slow targets, I got timeout in
gdb.base/funcargs.exp and gdb.base/completion.exp. The usual remedy I
use is to set timeout to higher value in site.exp.
However this does not help in case of aforementioned tests because they
set timeout to fixed value, regardless of whether the timeout has been
increased or not, causing them to fail on some of my machines.
This commit fixes the problem by using with_timeout_factor.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
gdb/testsuite/gdb.base/completion.exp | 1391 +++++++++++++------------
gdb/testsuite/gdb.base/funcargs.exp | 117 +--
2 files changed, 751 insertions(+), 757 deletions(-)
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 44cf649d5b6..669f983e1cf 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -61,374 +61,375 @@ if {![runto_main]} {
return
}
-set timeout 30
-gdb_test_no_output "set max-completions unlimited"
+with_timeout_factor 3 {
+ gdb_test_no_output "set max-completions unlimited"
-gdb_test_no_output "complete print values\[0\].x." \
- "field completion with invalid field"
+ gdb_test_no_output "complete print values\[0\].x." \
+ "field completion with invalid field"
-# If there is a non-deprecated completion, it should be returned.
-gdb_test "complete sav" "save" "test non-deprecated completion"
-# If there is only a deprecated completion, then it should be returned.
-gdb_test "complete save-t" "save-tracepoints" "test deprecated completion"
+ # If there is a non-deprecated completion, it should be returned.
+ gdb_test "complete sav" "save" "test non-deprecated completion"
+ # If there is only a deprecated completion, then it should be returned.
+ gdb_test "complete save-t" "save-tracepoints" "test deprecated completion"
-#
-# Tag name completion.
-#
+ #
+ # Tag name completion.
+ #
-gdb_test "complete ptype struct some_" "ptype struct some_struct"
-gdb_test "complete ptype enum some_" "ptype enum some_enum"
-gdb_test "complete ptype union some_" "ptype union some_union"
+ gdb_test "complete ptype struct some_" "ptype struct some_struct"
+ gdb_test "complete ptype enum some_" "ptype enum some_enum"
+ gdb_test "complete ptype union some_" "ptype union some_union"
-gdb_test "complete set gnutarget aut" "set gnutarget auto"
+ gdb_test "complete set gnutarget aut" "set gnutarget auto"
-gdb_test "complete set cp-abi aut" "set cp-abi auto"
+ gdb_test "complete set cp-abi aut" "set cp-abi auto"
-# Test that completion of commands 'target FOO' works well.
-set targets [list "core" "tfile" "exec"]
+ # Test that completion of commands 'target FOO' works well.
+ set targets [list "core" "tfile" "exec"]
-# Test artifacts are put in different locations depending on test
-# is a parallel run or not. Firstly check file exists, and then
-# do the test on file completion.
+ # Test artifacts are put in different locations depending on test
+ # is a parallel run or not. Firstly check file exists, and then
+ # do the test on file completion.
-foreach dir1 [ list "./gdb.base" "./outputs/gdb.base/completion" ] {
- if { [remote_file host exists ${dir1}/completion]
- && [remote_file host exists ${dir1}/completion0.o]
- && [remote_file host exists ${dir1}/completion1.o] } {
- foreach target_name ${targets} {
- gdb_test "complete target ${target_name} ${dir1}/completion" \
- "target ${target_name} ${dir1}/completion.*${dir1}/completion0\\.o.*${dir1}/completion1\\.o.*" \
- "complete target ${target_name}"
+ foreach dir1 [ list "./gdb.base" "./outputs/gdb.base/completion" ] {
+ if { [remote_file host exists ${dir1}/completion]
+ && [remote_file host exists ${dir1}/completion0.o]
+ && [remote_file host exists ${dir1}/completion1.o] } {
+ foreach target_name ${targets} {
+ gdb_test "complete target ${target_name} ${dir1}/completion" \
+ "target ${target_name} ${dir1}/completion.*${dir1}/completion0\\.o.*${dir1}/completion1\\.o.*" \
+ "complete target ${target_name}"
+ }
+ break
}
- break
}
-}
-#
-# "set foo unlimited" completion.
-#
+ #
+ # "set foo unlimited" completion.
+ #
-# A var_uinteger command.
-gdb_test "complete set height " "set height unlimited"
-gdb_test "complete set height u" "set height unlimited"
-
-# A var_integer command.
-gdb_test "complete set listsize " "set listsize unlimited"
-gdb_test "complete set listsize unl" "set listsize unlimited"
-
-# A var_zuinteger_unlimited command.
-gdb_test "complete set trace-buffer-size " "set trace-buffer-size unlimited"
-gdb_test "complete set trace-buffer-size unl" "set trace-buffer-size unlimited"
-
-# Test "info registers" completion: First determine this
-# architecture's registers and reggroups...
-
-set regs_output [capture_command_output "mt print registers" \
- ".*Name.*Nr.*Rel.*Offset.*Size.*Type.\[^\n\]*\n"]
-append regs_output "\n"
-append regs_output [capture_command_output "mt print reggroups" \
- ".*Group.*Type\[^\n]*\n"]
-append regs_output "\n"
-append regs_output [capture_command_output "mt print user-registers" \
- ".*Name.*Nr\[^\n]*\n"]
-set all_regs {}
-foreach {- reg} [regexp -all -inline -line {^(\w+)} $regs_output] {
- lappend all_regs $reg
-}
+ # A var_uinteger command.
+ gdb_test "complete set height " "set height unlimited"
+ gdb_test "complete set height u" "set height unlimited"
-set all_regs [join [lsort -unique $all_regs]]
+ # A var_integer command.
+ gdb_test "complete set listsize " "set listsize unlimited"
+ gdb_test "complete set listsize unl" "set listsize unlimited"
-# ... and then compare them to the completion of "info registers".
+ # A var_zuinteger_unlimited command.
+ gdb_test "complete set trace-buffer-size " "set trace-buffer-size unlimited"
+ gdb_test "complete set trace-buffer-size unl" "set trace-buffer-size unlimited"
-set regs_output [capture_command_output "complete info registers " ""]
-set completed_regs {}
-foreach {-> reg} [regexp -all -inline -line {^info registers (\w+\S*)} $regs_output] {
- lappend completed_regs $reg
-}
-set completed_regs [join [lsort $completed_regs]]
-gdb_assert {$all_regs eq $completed_regs} "complete 'info registers '"
+ # Test "info registers" completion: First determine this
+ # architecture's registers and reggroups...
-# Tests below are about tab-completion, which doesn't work if readline
-# library isn't used. Check it first.
+ set regs_output [capture_command_output "mt print registers" \
+ ".*Name.*Nr.*Rel.*Offset.*Size.*Type.\[^\n\]*\n"]
+ append regs_output "\n"
+ append regs_output [capture_command_output "mt print reggroups" \
+ ".*Group.*Type\[^\n]*\n"]
+ append regs_output "\n"
+ append regs_output [capture_command_output "mt print user-registers" \
+ ".*Name.*Nr\[^\n]*\n"]
+ set all_regs {}
+ foreach {- reg} [regexp -all -inline -line {^(\w+)} $regs_output] {
+ lappend all_regs $reg
+ }
-if { ![readline_is_used] } {
- return
-}
+ set all_regs [join [lsort -unique $all_regs]]
-# The bulk of this test script pre-dates the completion-support
-# library, and should probably (where possible) be converted.
-# However, for now, new tests are being added using this library.
-load_lib completion-support.exp
+ # ... and then compare them to the completion of "info registers".
-set test "complete 'hfgfh'"
-send_gdb "hfgfh\t"
-gdb_test_multiple "" "$test" {
- -re "^hfgfh\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" $test {
- -re "Undefined command: \"hfgfh\"\\. Try \"help\"\\..*$gdb_prompt $" {
- pass "$test"
+ set regs_output [capture_command_output "complete info registers " ""]
+ set completed_regs {}
+ foreach {-> reg} [regexp -all -inline -line {^info registers (\w+\S*)} $regs_output] {
+ lappend completed_regs $reg
+ }
+ set completed_regs [join [lsort $completed_regs]]
+ gdb_assert {$all_regs eq $completed_regs} "complete 'info registers '"
+
+ # Tests below are about tab-completion, which doesn't work if readline
+ # library isn't used. Check it first.
+
+ if { ![readline_is_used] } {
+ return
+ }
+
+ # The bulk of this test script pre-dates the completion-support
+ # library, and should probably (where possible) be converted.
+ # However, for now, new tests are being added using this library.
+ load_lib completion-support.exp
+
+ set test "complete 'hfgfh'"
+ send_gdb "hfgfh\t"
+ gdb_test_multiple "" "$test" {
+ -re "^hfgfh\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" $test {
+ -re "Undefined command: \"hfgfh\"\\. Try \"help\"\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-#exp_internal 0
+ #exp_internal 0
-set test "complete 'show output'"
-send_gdb "show output\t"
-gdb_test_multiple "" "$test" {
- -re "^show output-radix $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Default output radix for printing of values is 10\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'show output'"
+ send_gdb "show output\t"
+ gdb_test_multiple "" "$test" {
+ -re "^show output-radix $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Default output radix for printing of values is 10\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'show output-'"
-send_gdb "show output-\t"
-gdb_test_multiple "" "$test" {
- -re "^show output-radix $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Default output radix for printing of values is 10\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'show output-'"
+ send_gdb "show output-\t"
+ gdb_test_multiple "" "$test" {
+ -re "^show output-radix $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Default output radix for printing of values is 10\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'p'"
-send_gdb "p\t"
-gdb_test_multiple "" "$test" {
- -re "^p\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "The history is empty\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'p'"
+ send_gdb "p\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "The history is empty\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'p '"
-send_gdb "p \t"
-gdb_test_multiple "" "$test" {
- -re "^p \\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "The history is empty\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'p '"
+ send_gdb "p \t"
+ gdb_test_multiple "" "$test" {
+ -re "^p \\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "The history is empty\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info t foo'"
-send_gdb "info t foo\t"
-gdb_test_multiple "" "$test" {
- -re "^info t foo\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Ambiguous info command \"t foo\": target, tasks, terminal, threads, tp, tracepoints, tvariables, (type-printers, )?types\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info t foo'"
+ send_gdb "info t foo\t"
+ gdb_test_multiple "" "$test" {
+ -re "^info t foo\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Ambiguous info command \"t foo\": target, tasks, terminal, threads, tp, tracepoints, tvariables, (type-printers, )?types\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info t'"
-send_gdb "info t\t"
-gdb_test_multiple "" "$test" {
- -re "^info t\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Ambiguous info command \"t\": target, tasks, terminal, threads, tp, tracepoints, tvariables, (type-printers, )?types\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info t'"
+ send_gdb "info t\t"
+ gdb_test_multiple "" "$test" {
+ -re "^info t\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Ambiguous info command \"t\": target, tasks, terminal, threads, tp, tracepoints, tvariables, (type-printers, )?types\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info t '"
-send_gdb "info t \t"
-gdb_test_multiple "" "$test" {
- -re "^info t \\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Ambiguous info command \"t \": target, tasks, terminal, threads, tp, tracepoints, tvariables, (type-printers, )?types\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info t '"
+ send_gdb "info t \t"
+ gdb_test_multiple "" "$test" {
+ -re "^info t \\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Ambiguous info command \"t \": target, tasks, terminal, threads, tp, tracepoints, tvariables, (type-printers, )?types\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info asdfgh'"
-send_gdb "info asdfgh\t"
-gdb_test_multiple "" "$test" {
- -re "^info asdfgh\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Undefined info command: \"asdfgh\". Try \"help info\"\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info asdfgh'"
+ send_gdb "info asdfgh\t"
+ gdb_test_multiple "" "$test" {
+ -re "^info asdfgh\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Undefined info command: \"asdfgh\". Try \"help info\"\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info asdfgh '"
-send_gdb "info asdfgh \t"
-gdb_test_multiple "" "$test" {
- -re "^info asdfgh \\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Undefined info command: \"asdfgh \". Try \"help info\"\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info asdfgh '"
+ send_gdb "info asdfgh \t"
+ gdb_test_multiple "" "$test" {
+ -re "^info asdfgh \\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Undefined info command: \"asdfgh \". Try \"help info\"\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info'"
-send_gdb "info\t"
-gdb_test_multiple "" "$test" {
- -re "^info $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "List of \"info\" subcommands.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info'"
+ send_gdb "info\t"
+ gdb_test_multiple "" "$test" {
+ -re "^info $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "List of \"info\" subcommands.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info '"
-send_gdb "info \t"
-gdb_test_multiple "" "$test" {
- -re "^info \\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "List of \"info\" subcommands:\r\n\r\n.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info '"
+ send_gdb "info \t"
+ gdb_test_multiple "" "$test" {
+ -re "^info \\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "List of \"info\" subcommands:\r\n\r\n.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete (2) 'info '"
-send_gdb "info \t"
-gdb_test_multiple "" "$test" {
- -re "^info \\\x07$" {
- send_gdb "\t"
- gdb_test_multiple "" "$test" {
- -re "address.*types.*$gdb_prompt " {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "allowed if unambiguous\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete (2) 'info '"
+ send_gdb "info \t"
+ gdb_test_multiple "" "$test" {
+ -re "^info \\\x07$" {
+ send_gdb "\t"
+ gdb_test_multiple "" "$test" {
+ -re "address.*types.*$gdb_prompt " {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "allowed if unambiguous\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
}
}
-}
-set test "complete 'help info wat'"
-send_gdb "help info wat\t"
-gdb_test_multiple "" "$test" {
- -re "^help info watchpoints $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Status of specified watchpoints.*\r\n.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'help info wat'"
+ send_gdb "help info wat\t"
+ gdb_test_multiple "" "$test" {
+ -re "^help info watchpoints $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Status of specified watchpoints.*\r\n.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
+ -re "^help info wat\\\x07$" {
+ fail "$test"
+ }
}
- -re "^help info wat\\\x07$" {
- fail "$test"
- }
-}
-set test "complete 'p \"break1'"
-send_gdb "p \"break1\t"
-gdb_test_multiple "" "$test" {
- -re "^p \"break1\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {}
- }
- -re "^p \"break1\\.c\"$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "$gdb_prompt $" {
- pass "$test"
+ set test "complete 'p \"break1'"
+ send_gdb "p \"break1\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p \"break1\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {}
+ }
+ -re "^p \"break1\\.c\"$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-setup_xfail "*-*-*"
-set test "complete 'p \"break1.'"
-send_gdb "p \"break1.\t"
-gdb_test_multiple "" "$test" {
- -re "^p \"break1\\.\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {}
- }
- -re "^p \"break1\\.c\"$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "$gdb_prompt $" {
- pass "$test"
+ setup_xfail "*-*-*"
+ set test "complete 'p \"break1.'"
+ send_gdb "p \"break1.\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p \"break1\\.\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {}
+ }
+ -re "^p \"break1\\.c\"$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "$gdb_prompt $" {
+ pass "$test"
+ }
}
}
+ -re "^p \"break1\\..*$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {}
+ }
}
- -re "^p \"break1\\..*$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {}
- }
-}
-set test "complete 'p 'arg'"
-send_gdb "p 'arg\t"
-gdb_test_multiple "" "$test" {
- -re "^p 'arg\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'p 'arg'"
+ send_gdb "p 'arg\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p 'arg\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete (2) 'p 'arg'"
-send_gdb "p 'arg\t"
-gdb_test_multiple "" "$test" {
- -re "^p 'arg\\\x07$" {
- send_gdb "\t"
- gdb_test_multiple "" "$test" {
- -re "argv.*$gdb_prompt " {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
- pass "$test"
+ set test "complete (2) 'p 'arg'"
+ send_gdb "p 'arg\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p 'arg\\\x07$" {
+ send_gdb "\t"
+ gdb_test_multiple "" "$test" {
+ -re "argv.*$gdb_prompt " {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
- }
- -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
- send_gdb "n"
- gdb_test_multiple "" "$test" {
- -re "\\(gdb\\) p 'arg$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
- pass "$test"
+ -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
+ send_gdb "n"
+ gdb_test_multiple "" "$test" {
+ -re "\\(gdb\\) p 'arg$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
@@ -436,562 +437,562 @@ gdb_test_multiple "" "$test" {
}
}
}
-}
-set test "complete 'handle signal'"
-send_gdb "handle sigq\t"
-gdb_test_multiple "" "$test" {
- -re "^handle sigq\b\b\b\bSIGQUIT $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "SIGQUIT.*Quit.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'handle signal'"
+ send_gdb "handle sigq\t"
+ gdb_test_multiple "" "$test" {
+ -re "^handle sigq\b\b\b\bSIGQUIT $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "SIGQUIT.*Quit.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'handle keyword'"
-send_gdb "handle nos\t"
-gdb_test_multiple "" "$test" {
- -re "^handle nostop $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "$gdb_prompt $" {
- pass "$test"
+ set test "complete 'handle keyword'"
+ send_gdb "handle nos\t"
+ gdb_test_multiple "" "$test" {
+ -re "^handle nostop $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete help aliases"
-send_gdb "help user-define\t"
-gdb_test_multiple "" "$test" {
- -re "^help user-defined $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "$gdb_prompt $" {
- pass "$test"
+ set test "complete help aliases"
+ send_gdb "help user-define\t"
+ gdb_test_multiple "" "$test" {
+ -re "^help user-defined $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-# These tests used to try completing the shorter "p b-a".
-# Unfortunately, on some systems, there are .o files in system
-# libraries which declare static variables named `b'. Of course,
-# those variables aren't really in scope, as far as the compiler is
-# concerned. But GDB deliberately tries to be more liberal: if you
-# enter an identifier that doesn't have any binding in scope, GDB will
-# search all the program's compilation units for a static variable of
-# the given name.
-#
-# This behavior can help avoid a lot of pedantry, so it's usually a
-# good thing. But in this test case, it causes GDB to print the value
-# of some random variable, instead of giving us the "No symbol..."
-# error we were expecting.
-#
-# For example, on S/390 linux, the file s_atan.c in libm.a declares a
-# `b', which is a structure containing an int and a float, so GDB says
-# ``Argument to arithmetic operation not a number or boolean'' instead
-# of ``No symbol ...''.
-#
-# So, I'm hoping that there is no system with a static library variable named
-# `no_var_by_this_name'.
-
-set test "complete 'p no_var_named_this-arg'"
-send_gdb "p no_var_named_this-arg\t"
-gdb_test_multiple "" "$test" {
- -re "^p no_var_named_this-arg\\\x07$" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
- pass "$test"
+ # These tests used to try completing the shorter "p b-a".
+ # Unfortunately, on some systems, there are .o files in system
+ # libraries which declare static variables named `b'. Of course,
+ # those variables aren't really in scope, as far as the compiler is
+ # concerned. But GDB deliberately tries to be more liberal: if you
+ # enter an identifier that doesn't have any binding in scope, GDB will
+ # search all the program's compilation units for a static variable of
+ # the given name.
+ #
+ # This behavior can help avoid a lot of pedantry, so it's usually a
+ # good thing. But in this test case, it causes GDB to print the value
+ # of some random variable, instead of giving us the "No symbol..."
+ # error we were expecting.
+ #
+ # For example, on S/390 linux, the file s_atan.c in libm.a declares a
+ # `b', which is a structure containing an int and a float, so GDB says
+ # ``Argument to arithmetic operation not a number or boolean'' instead
+ # of ``No symbol ...''.
+ #
+ # So, I'm hoping that there is no system with a static library variable named
+ # `no_var_by_this_name'.
+
+ set test "complete 'p no_var_named_this-arg'"
+ send_gdb "p no_var_named_this-arg\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p no_var_named_this-arg\\\x07$" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete (2) 'p no_var_named_this-arg'"
-send_gdb "p no_var_named_this-arg\t"
-gdb_test_multiple "" "$test" {
- -re "^p no_var_named_this-arg\\\x07$" {
- send_gdb "\t"
- gdb_test_multiple "" "$test" {
- -re "argv.*$gdb_prompt " {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete (2) 'p no_var_named_this-arg'"
+ send_gdb "p no_var_named_this-arg\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p no_var_named_this-arg\\\x07$" {
+ send_gdb "\t"
+ gdb_test_multiple "" "$test" {
+ -re "argv.*$gdb_prompt " {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
- }
- -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
- send_gdb "n\n"
+ -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
+ send_gdb "n\n"
- # Eat the prompt
- gdb_expect {
- -re "$gdb_prompt " {
- pass "$test, eat prompt"
- }
- timeout {
- fail "$test, eat prompt (timeout)"
+ # Eat the prompt
+ gdb_expect {
+ -re "$gdb_prompt " {
+ pass "$test, eat prompt"
+ }
+ timeout {
+ fail "$test, eat prompt (timeout)"
+ }
}
- }
- gdb_test_multiple "" "$test" {
- -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
- pass "$test"
+ gdb_test_multiple "" "$test" {
+ -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
}
}
-}
-set test "complete (2) 'p no_var_named_this-'"
-send_gdb "p no_var_named_this-\t"
-gdb_test_multiple "" "$test" {
- -re "^p no_var_named_this-\\\x07$" {
- send_gdb "\t"
- gdb_test_multiple "" "$test" {
- -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
- send_gdb "n\n"
+ set test "complete (2) 'p no_var_named_this-'"
+ send_gdb "p no_var_named_this-\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p no_var_named_this-\\\x07$" {
+ send_gdb "\t"
+ gdb_test_multiple "" "$test" {
+ -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
+ send_gdb "n\n"
- # Eat the prompt
- gdb_expect {
- -re "$gdb_prompt " {
- pass "$test, eat prompt"
- }
- timeout {
- fail "$test, eat prompt (timeout)"
+ # Eat the prompt
+ gdb_expect {
+ -re "$gdb_prompt " {
+ pass "$test, eat prompt"
+ }
+ timeout {
+ fail "$test, eat prompt (timeout)"
+ }
}
- }
- gdb_test_multiple "" "$test" {
- -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
- pass "$test"
+ gdb_test_multiple "" "$test" {
+ -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
- }
- -re "argv.*$gdb_prompt $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
- pass "$test"
+ -re "argv.*$gdb_prompt $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
}
}
-}
-set test "complete 'p values\[0\].a'"
-send_gdb "p values\[0\].a\t"
-gdb_test_multiple "" "$test" {
- -re "^p values.0..a_field $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re " = 0.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'p values\[0\].a'"
+ send_gdb "p values\[0\].a\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p values.0..a_field $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re " = 0.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'p values\[0\] . a'"
-send_gdb "p values\[0\] . a\t"
-gdb_test_multiple "" "$test" {
- -re "^p values.0. . a_field $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re " = 0.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'p values\[0\] . a'"
+ send_gdb "p values\[0\] . a\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p values.0. . a_field $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re " = 0.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'p &values\[0\] -> a'"
-send_gdb "p &values\[0\] -> a\t"
-gdb_test_multiple "" "$test" {
- -re "^p &values.0. -> a_field $" {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re " = .*0x\[0-9a-fA-F\]*.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'p &values\[0\] -> a'"
+ send_gdb "p &values\[0\] -> a\t"
+ gdb_test_multiple "" "$test" {
+ -re "^p &values.0. -> a_field $" {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re " = .*0x\[0-9a-fA-F\]*.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-gdb_test "complete p &values\[0\]->z" \
- "p &values.0.->z_field" \
- "completion of field in anonymous union"
+ gdb_test "complete p &values\[0\]->z" \
+ "p &values.0.->z_field" \
+ "completion of field in anonymous union"
-gdb_test "complete ptype &values\[0\]->z" \
- "ptype &values.0.->z_field" \
- "ptype completion of field in anonymous union"
+ gdb_test "complete ptype &values\[0\]->z" \
+ "ptype &values.0.->z_field" \
+ "ptype completion of field in anonymous union"
-gdb_test "complete whatis &values\[0\]->z" \
- "whatis &values.0.->z_field" \
- "whatis completion of field in anonymous union"
+ gdb_test "complete whatis &values\[0\]->z" \
+ "whatis &values.0.->z_field" \
+ "whatis completion of field in anonymous union"
-# The following tests used to simply try to complete `${objdir}/file',
-# and so on. The problem is that ${objdir} can be very long; the
-# completed filename may be more than eighty characters wide. When
-# this happens, readline tries to manage things, producing output that
-# may make sense on the screen, but is rather hard for our script to
-# recognize.
-#
-# In the case that motivated this change, the (gdb) prompt occupied
-# the leftmost six columns, and `${objdir}/' was seventy-four
-# characters long --- eighty in all. After printing the slash,
-# readline emitted a space, a carriage return, and then `Makefile'
-# (the tab character being received as input after `Make'.
-#
-# Basically, you have to let readline do whatever it's going to do to
-# make the screen look right. If it happens to use a different
-# strategy on Tuesdays to get the cursor in the right place, that's
-# not something the testsuite should care about.
-#
-# So, we avoid long lines. We `cd' to ${srcdir} first, and then do
-# the completion relative to the current directory.
+ # The following tests used to simply try to complete `${objdir}/file',
+ # and so on. The problem is that ${objdir} can be very long; the
+ # completed filename may be more than eighty characters wide. When
+ # this happens, readline tries to manage things, producing output that
+ # may make sense on the screen, but is rather hard for our script to
+ # recognize.
+ #
+ # In the case that motivated this change, the (gdb) prompt occupied
+ # the leftmost six columns, and `${objdir}/' was seventy-four
+ # characters long --- eighty in all. After printing the slash,
+ # readline emitted a space, a carriage return, and then `Makefile'
+ # (the tab character being received as input after `Make'.
+ #
+ # Basically, you have to let readline do whatever it's going to do to
+ # make the screen look right. If it happens to use a different
+ # strategy on Tuesdays to get the cursor in the right place, that's
+ # not something the testsuite should care about.
+ #
+ # So, we avoid long lines. We `cd' to ${srcdir} first, and then do
+ # the completion relative to the current directory.
-# ${srcdir} may be a relative path. We want to make sure we end up
-# in the right directory - so make sure we know where it is.
-with_cwd $srcdir {
- set fullsrcdir [pwd]
-}
+ # ${srcdir} may be a relative path. We want to make sure we end up
+ # in the right directory - so make sure we know where it is.
+ with_cwd $srcdir {
+ set fullsrcdir [pwd]
+ }
-# If the directory name contains a '+' we must escape it, adding a backslash.
-# If not, the test below will fail because it will interpret the '+' as a
-# regexp operator. We use string_to_regexp for this purpose.
+ # If the directory name contains a '+' we must escape it, adding a backslash.
+ # If not, the test below will fail because it will interpret the '+' as a
+ # regexp operator. We use string_to_regexp for this purpose.
-gdb_test "cd ${fullsrcdir}" \
- "Working directory [string_to_regexp ${fullsrcdir}].*" \
- "cd to \${srcdir}"
+ gdb_test "cd ${fullsrcdir}" \
+ "Working directory [string_to_regexp ${fullsrcdir}].*" \
+ "cd to \${srcdir}"
-# GDB used to fail adding / on directories, on the first try only.
-set uniquedir ../testsuite/gdb.base/comp-dir
-set escapeduniquedir [string_to_regexp ${uniquedir}]
-set uniquesu subdi
-set uniquesub ${uniquesu}r
-set escapeuniquesub [string_to_regexp ${uniquesub}]
-send_gdb "dir ${uniquedir}\t"
-gdb_expect {
- -re "${escapeduniquedir}/" {
- pass "directory completion"
- send_gdb "${uniquesu}\t"
- }
- -re "${escapeduniquedir} $" {
- fail "directory completion (old gdb bug)"
- send_gdb "\b/${uniquesu}\t"
- }
- default {
- fail "directory completion (timeout)"
- send_gdb "\ndir ${uniquedir}/${uniquesu}\t"
- }
-}
+ # GDB used to fail adding / on directories, on the first try only.
+ set uniquedir ../testsuite/gdb.base/comp-dir
+ set escapeduniquedir [string_to_regexp ${uniquedir}]
+ set uniquesu subdi
+ set uniquesub ${uniquesu}r
+ set escapeuniquesub [string_to_regexp ${uniquesub}]
+ send_gdb "dir ${uniquedir}\t"
+ gdb_expect {
+ -re "${escapeduniquedir}/" {
+ pass "directory completion"
+ send_gdb "${uniquesu}\t"
+ }
+ -re "${escapeduniquedir} $" {
+ fail "directory completion (old gdb bug)"
+ send_gdb "\b/${uniquesu}\t"
+ }
+ default {
+ fail "directory completion (timeout)"
+ send_gdb "\ndir ${uniquedir}/${uniquesu}\t"
+ }
+ }
-gdb_expect {
- -re "${escapeuniquesub}/$" {
- pass "directory completion 2"
- }
- timeout {
- fail "directory completion 2"
- }
-}
+ gdb_expect {
+ -re "${escapeuniquesub}/$" {
+ pass "directory completion 2"
+ }
+ timeout {
+ fail "directory completion 2"
+ }
+ }
-# Empty COMMAND sends no newline while " " sends the newline we need.
-gdb_test " " "Source directories searched: .*" "glob remaining of directory test"
+ # Empty COMMAND sends no newline while " " sends the newline we need.
+ gdb_test " " "Source directories searched: .*" "glob remaining of directory test"
-gdb_test "complete file ./gdb.base/compl" \
- "file ./gdb.base/completion\\.exp.*" \
- "complete-command 'file ./gdb.base/compl'"
+ gdb_test "complete file ./gdb.base/compl" \
+ "file ./gdb.base/completion\\.exp.*" \
+ "complete-command 'file ./gdb.base/compl'"
-set test "complete 'file ./gdb.base/completi'"
-send_gdb "file ./gdb.base/completi\t"
-gdb_test_multiple "" "$test" {
- -re "^file ./gdb.base/completion\\.exp $" {
- send_gdb "\n"
- # Ignore the exact error message.
- gdb_test_multiple "" "complete 'file ./gdb.base/completi'" {
- -re "\r\nA program is being debugged already\\.\[\r\n\]+Are you sure you want to change the file\\? \\(y or n\\) $" {
- send_gdb "n\n"
- exp_continue
- }
- -re "$gdb_prompt $" {
- pass "$test"
+ set test "complete 'file ./gdb.base/completi'"
+ send_gdb "file ./gdb.base/completi\t"
+ gdb_test_multiple "" "$test" {
+ -re "^file ./gdb.base/completion\\.exp $" {
+ send_gdb "\n"
+ # Ignore the exact error message.
+ gdb_test_multiple "" "complete 'file ./gdb.base/completi'" {
+ -re "\r\nA program is being debugged already\\.\[\r\n\]+Are you sure you want to change the file\\? \\(y or n\\) $" {
+ send_gdb "n\n"
+ exp_continue
+ }
+ -re "$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-set test "complete 'info func marke'"
-send_gdb "info func marke\t"
-gdb_test_multiple "" "$test" {
- -re "^info func marke.*r$" {
- send_gdb "\t\t"
- gdb_test_multiple "" "$test" {
- -re "marker1.*$gdb_prompt " {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "All functions matching regular expression \"marker\":.*File.*break1.c:.*\tint marker1\\((void|)\\);\r\n.*:\tint marker2\\(int\\).*marker3\\(char.*char.*\\).*marker4\\(long( int)?\\);.*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'info func marke'"
+ send_gdb "info func marke\t"
+ gdb_test_multiple "" "$test" {
+ -re "^info func marke.*r$" {
+ send_gdb "\t\t"
+ gdb_test_multiple "" "$test" {
+ -re "marker1.*$gdb_prompt " {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "All functions matching regular expression \"marker\":.*File.*break1.c:.*\tint marker1\\((void|)\\);\r\n.*:\tint marker2\\(int\\).*marker3\\(char.*char.*\\).*marker4\\(long( int)?\\);.*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
}
}
-}
-set test "complete 'set follow-fork-mode'"
-send_gdb "set follow-fork-mode \t\t"
-gdb_test_multiple "" "$test" {
- -re "child.*parent.*$gdb_prompt " {
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "Requires an argument.*child.*parent.*$gdb_prompt $" {
- pass "$test"
- }
- -re "Ambiguous item \"\"\\..*$gdb_prompt $" {
- pass "$test"
+ set test "complete 'set follow-fork-mode'"
+ send_gdb "set follow-fork-mode \t\t"
+ gdb_test_multiple "" "$test" {
+ -re "child.*parent.*$gdb_prompt " {
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "Requires an argument.*child.*parent.*$gdb_prompt $" {
+ pass "$test"
+ }
+ -re "Ambiguous item \"\"\\..*$gdb_prompt $" {
+ pass "$test"
+ }
}
}
}
-}
-#
-# Tests for the location completer
-#
+ #
+ # Tests for the location completer
+ #
-# Turn off pending breakpoint support so that we don't get queried
-# all the time.
-gdb_test_no_output "set breakpoint pending off"
+ # Turn off pending breakpoint support so that we don't get queried
+ # all the time.
+ gdb_test_no_output "set breakpoint pending off"
-set subsrc [string range $srcfile 0 [expr {[string length $srcfile] - 3}]]
-set test "tab complete break $subsrc"
-send_gdb "break $subsrc\t\t"
-gdb_test_multiple "" $test {
- -re "break\.c.*break1\.c.*$gdb_prompt " {
- send_gdb "1\t\n"
- gdb_test_multiple "" $test {
- -re "malformed linespec error: unexpected end of input\r\n$gdb_prompt " {
- pass $test
- }
- -re "$gdb_prompt p$" {
- fail $test
+ set subsrc [string range $srcfile 0 [expr {[string length $srcfile] - 3}]]
+ set test "tab complete break $subsrc"
+ send_gdb "break $subsrc\t\t"
+ gdb_test_multiple "" $test {
+ -re "break\.c.*break1\.c.*$gdb_prompt " {
+ send_gdb "1\t\n"
+ gdb_test_multiple "" $test {
+ -re "malformed linespec error: unexpected end of input\r\n$gdb_prompt " {
+ pass $test
+ }
+ -re "$gdb_prompt p$" {
+ fail $test
+ }
}
}
- }
- -re "$gdb_prompt p$" {
- fail $test
+ -re "$gdb_prompt p$" {
+ fail $test
+ }
}
-}
-gdb_test "complete break $subsrc" "break\.c.*break1\.c"
+ gdb_test "complete break $subsrc" "break\.c.*break1\.c"
-set test "tab complete break need"
-send_gdb "break need\t"
-gdb_test_multiple "" $test {
- -re "break need_malloc " {
- send_gdb "\n"
- gdb_test_multiple "" $test {
- -re ".*Breakpoint.*at .*/$srcfile, line .*$gdb_prompt " {
- pass $test
- gdb_test_no_output "delete breakpoint \$bpnum" \
- "delete breakpoint for $test"
- }
- -re "$gdb_prompt p$" {
- fail $test
+ set test "tab complete break need"
+ send_gdb "break need\t"
+ gdb_test_multiple "" $test {
+ -re "break need_malloc " {
+ send_gdb "\n"
+ gdb_test_multiple "" $test {
+ -re ".*Breakpoint.*at .*/$srcfile, line .*$gdb_prompt " {
+ pass $test
+ gdb_test_no_output "delete breakpoint \$bpnum" \
+ "delete breakpoint for $test"
+ }
+ -re "$gdb_prompt p$" {
+ fail $test
+ }
}
}
+ -re "$gdb_prompt p$" {
+ fail $test
+ }
}
- -re "$gdb_prompt p$" {
- fail $test
- }
-}
-gdb_test "complete break need" "need_malloc"
+ gdb_test "complete break need" "need_malloc"
-# gdb/17960
-# Enabling max-completions is necessary to trigger the bug.
-gdb_test_no_output "set max-completions 10"
-set test "tab complete break $srcfile:ma"
-send_gdb "break $srcfile:ma\t"
-gdb_test_multiple "" $test {
- -re "break $srcfile:main " {
- send_gdb "\n"
- gdb_test_multiple "" $test {
- -re ".*Breakpoint.*at .*/$srcfile, line .*$gdb_prompt " {
- pass $test
- gdb_test_no_output "delete breakpoint \$bpnum" \
- "delete breakpoint for $test"
- }
- -re "$gdb_prompt p$" {
- fail $test
+ # gdb/17960
+ # Enabling max-completions is necessary to trigger the bug.
+ gdb_test_no_output "set max-completions 10"
+ set test "tab complete break $srcfile:ma"
+ send_gdb "break $srcfile:ma\t"
+ gdb_test_multiple "" $test {
+ -re "break $srcfile:main " {
+ send_gdb "\n"
+ gdb_test_multiple "" $test {
+ -re ".*Breakpoint.*at .*/$srcfile, line .*$gdb_prompt " {
+ pass $test
+ gdb_test_no_output "delete breakpoint \$bpnum" \
+ "delete breakpoint for $test"
+ }
+ -re "$gdb_prompt p$" {
+ fail $test
+ }
}
}
+ -re "$gdb_prompt p$" {
+ fail $test
+ }
}
- -re "$gdb_prompt p$" {
- fail $test
- }
-}
-gdb_test "complete break $srcfile:ma" "break\.c:main"
+ gdb_test "complete break $srcfile:ma" "break\.c:main"
-# End of gdb/17960 testing.
+ # End of gdb/17960 testing.
-#
-# Completion limiting.
-#
+ #
+ # Completion limiting.
+ #
-gdb_test_no_output "set max-completions 5"
+ gdb_test_no_output "set max-completions 5"
-proc ignore_and_resync {cmd result test} {
- global gdb_prompt
+ proc ignore_and_resync {cmd result test} {
+ global gdb_prompt
- gdb_test_multiple "" "$test" {
- -re "^${cmd}$" {
- # Complete the command and ignore the output
- # to resync gdb for the next test.
- send_gdb "\n"
- gdb_test_multiple "" "$test" {
- -re "$gdb_prompt $" {
- $result $test
+ gdb_test_multiple "" "$test" {
+ -re "^${cmd}$" {
+ # Complete the command and ignore the output
+ # to resync gdb for the next test.
+ send_gdb "\n"
+ gdb_test_multiple "" "$test" {
+ -re "$gdb_prompt $" {
+ $result $test
+ }
}
}
}
}
-}
-proc test_tab_complete {cmd test} {
- global gdb_prompt
+ proc test_tab_complete {cmd test} {
+ global gdb_prompt
- send_gdb "${cmd}\t"
- gdb_test_multiple "" "$test" {
- -re "^${cmd}\\\x07$" {
- send_gdb "\t"
- gdb_test_multiple "" "$test" {
- -re "List may be truncated, max-completions reached.*\r\n$gdb_prompt " {
- ignore_and_resync $cmd pass $test
- }
- -re "$gdb_prompt " {
- ignore_and_resync $cmd fail $test
+ send_gdb "${cmd}\t"
+ gdb_test_multiple "" "$test" {
+ -re "^${cmd}\\\x07$" {
+ send_gdb "\t"
+ gdb_test_multiple "" "$test" {
+ -re "List may be truncated, max-completions reached.*\r\n$gdb_prompt " {
+ ignore_and_resync $cmd pass $test
+ }
+ -re "$gdb_prompt " {
+ ignore_and_resync $cmd fail $test
+ }
}
}
}
}
-}
-test_tab_complete "p" \
- "command-name completion limiting using tab character"
+ test_tab_complete "p" \
+ "command-name completion limiting using tab character"
-set test "command-name completion limiting using complete command"
-send_gdb "complete p\n"
-gdb_test_multiple "" "$test" {
- -re "List may be truncated, max-completions reached.*\r\n$gdb_prompt $" {
- pass "$test"
+ set test "command-name completion limiting using complete command"
+ send_gdb "complete p\n"
+ gdb_test_multiple "" "$test" {
+ -re "List may be truncated, max-completions reached.*\r\n$gdb_prompt $" {
+ pass "$test"
+ }
}
-}
-
-gdb_test_no_output "set max-completions 3"
-test_tab_complete "p marker" \
- "symbol-name completion limiting using tab character"
+ gdb_test_no_output "set max-completions 3"
-set test "symbol-name completion limiting using complete command"
-send_gdb "complete p mark\n"
-gdb_test_multiple "" "$test" {
- -re "List may be truncated, max-completions reached.*\r\n$gdb_prompt $" {
- pass "$test"
- }
-}
+ test_tab_complete "p marker" \
+ "symbol-name completion limiting using tab character"
-# Test completion of 'p', 'x', and 'display' all using a /FMT.
-foreach_with_prefix spc { " " "" } {
- test_gdb_complete_multiple "p${spc}/d some_union_global." "" "f" {
- "f1"
- "f2"
+ set test "symbol-name completion limiting using complete command"
+ send_gdb "complete p mark\n"
+ gdb_test_multiple "" "$test" {
+ -re "List may be truncated, max-completions reached.*\r\n$gdb_prompt $" {
+ pass "$test"
+ }
}
- test_gdb_complete_none "p${spc}/"
- test_gdb_complete_unique "p${spc}/d" "p${spc}/d"
+ # Test completion of 'p', 'x', and 'display' all using a /FMT.
+ foreach_with_prefix spc { " " "" } {
+ test_gdb_complete_multiple "p${spc}/d some_union_global." "" "f" {
+ "f1"
+ "f2"
+ }
- # Try completion on an invalid /FMT string. GDB doesn't attempt
- # to validate the /FMT string during completion, the string is
- # just assumed to be complete when the user hits TAB.
- test_gdb_complete_unique "p${spc}/@" "p${spc}/@"
+ test_gdb_complete_none "p${spc}/"
+ test_gdb_complete_unique "p${spc}/d" "p${spc}/d"
- test_gdb_complete_unique "x${spc}/1w values\[0\].b"\
- "x${spc}/1w values\[0\].b_field"
+ # Try completion on an invalid /FMT string. GDB doesn't attempt
+ # to validate the /FMT string during completion, the string is
+ # just assumed to be complete when the user hits TAB.
+ test_gdb_complete_unique "p${spc}/@" "p${spc}/@"
- test_gdb_complete_unique "display${spc}/x values\[0\].z"\
- "display${spc}/x values\[0\].z_field"
-}
+ test_gdb_complete_unique "x${spc}/1w values\[0\].b"\
+ "x${spc}/1w values\[0\].b_field"
-# Test 'p' using both options and /FMT.
-test_gdb_complete_multiple "p -array on -- /d some_union_global." \
- "" "f" {
- "f1"
- "f2"
+ test_gdb_complete_unique "display${spc}/x values\[0\].z"\
+ "display${spc}/x values\[0\].z_field"
}
-# Check the watch commands can all complete, with and without flags.
-foreach_with_prefix cmd { "watch" "awatch" "rwatch" } {
- foreach_with_prefix opt { "" "-l" "-location" } {
- test_gdb_complete_multiple "${cmd} ${opt} some_union_global." \
- "" "f" {
- "f1"
- "f2"
- }
+ # Test 'p' using both options and /FMT.
+ test_gdb_complete_multiple "p -array on -- /d some_union_global." \
+ "" "f" {
+ "f1"
+ "f2"
+ }
+
+ # Check the watch commands can all complete, with and without flags.
+ foreach_with_prefix cmd { "watch" "awatch" "rwatch" } {
+ foreach_with_prefix opt { "" "-l" "-location" } {
+ test_gdb_complete_multiple "${cmd} ${opt} some_union_global." \
+ "" "f" {
+ "f1"
+ "f2"
+ }
+ }
}
-}
-# Check that tab completion of a deprecated alias does not display the
-# warning about the alias being deprecated during tab completion.
-gdb_test_no_output "alias xxx_yyy_zzz=break"
-gdb_test_no_output "maint deprecate xxx_yyy_zzz"
-test_gdb_complete_unique "xxx_yyy_" "xxx_yyy_zzz"
+ # Check that tab completion of a deprecated alias does not display the
+ # warning about the alias being deprecated during tab completion.
+ gdb_test_no_output "alias xxx_yyy_zzz=break"
+ gdb_test_no_output "maint deprecate xxx_yyy_zzz"
+ test_gdb_complete_unique "xxx_yyy_" "xxx_yyy_zzz"
-# Check that tab completion of a deprecated alias with a prefix does
-# not display the warning about the alias being deprecated during tab
-# completion.
-gdb_test_no_output "alias set aaa_bbb_ccc=set debug"
-gdb_test_no_output "maint deprecate set aaa_bbb_ccc"
-test_gdb_complete_unique "set aaa_bbb_" "set aaa_bbb_ccc"
+ # Check that tab completion of a deprecated alias with a prefix does
+ # not display the warning about the alias being deprecated during tab
+ # completion.
+ gdb_test_no_output "alias set aaa_bbb_ccc=set debug"
+ gdb_test_no_output "maint deprecate set aaa_bbb_ccc"
+ test_gdb_complete_unique "set aaa_bbb_" "set aaa_bbb_ccc"
-# Test command completion for the disassemble command.
-test_gdb_complete_unique \
- "disassemble multi_line_if" \
- "disassemble multi_line_if_conditional"
+ # Test command completion for the disassemble command.
+ test_gdb_complete_unique \
+ "disassemble multi_line_if" \
+ "disassemble multi_line_if_conditional"
-test_gdb_complete_multiple "disassemble " \
- "multi_li" "ne_" {
- "multi_line_if_conditional"
- "multi_line_while_conditional"
- }
+ test_gdb_complete_multiple "disassemble " \
+ "multi_li" "ne_" {
+ "multi_line_if_conditional"
+ "multi_line_while_conditional"
+ }
-foreach_with_prefix spc { " " "" } {
- test_gdb_complete_none "disassemble${spc}/"
+ foreach_with_prefix spc { " " "" } {
+ test_gdb_complete_none "disassemble${spc}/"
- foreach_with_prefix flg { "r" "b" "rb" "s" "m" "ms" } {
- test_gdb_complete_unique "disassemble${spc}/${flg}" \
- "disassemble${spc}/${flg}"
+ foreach_with_prefix flg { "r" "b" "rb" "s" "m" "ms" } {
+ test_gdb_complete_unique "disassemble${spc}/${flg}" \
+ "disassemble${spc}/${flg}"
- test_gdb_complete_unique \
- "disassemble${spc}/${flg} multi_line_if" \
- "disassemble${spc}/${flg} multi_line_if_conditional"
+ test_gdb_complete_unique \
+ "disassemble${spc}/${flg} multi_line_if" \
+ "disassemble${spc}/${flg} multi_line_if_conditional"
- test_gdb_complete_multiple "disassemble${spc}/${flg} " \
- "multi_li" "ne_" {
- "multi_line_if_conditional"
- "multi_line_while_conditional"
- }
+ test_gdb_complete_multiple "disassemble${spc}/${flg} " \
+ "multi_li" "ne_" {
+ "multi_line_if_conditional"
+ "multi_line_while_conditional"
+ }
+ }
}
}
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index fdfdf07b78c..1873a6eb7af 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -1031,77 +1031,70 @@ proc_with_prefix stepping_over_trampolines { } {
}
}
-set prev_timeout $timeout
-if {[istarget "mips*tx39-*"]} {
- set timeout 300
-} else {
- set timeout 60
-}
-
-# Determine expected output for unsigned long variables,
-# the output varies with sizeof (unsigned long).
-
-gdb_test_multiple "print sizeof (long)" "getting sizeof long" {
- -re ".\[0-9\]* = 4.*$gdb_prompt $" {
- set target_sizeof_long 4
- # pass silently
- }
- -re ".\[0-9\]* = 8.*$gdb_prompt $" {
- set target_sizeof_long 8
- # pass silently
+with_timeout_factor 6 {
+ # Determine expected output for unsigned long variables,
+ # the output varies with sizeof (unsigned long).
+
+ gdb_test_multiple "print sizeof (long)" "getting sizeof long" {
+ -re ".\[0-9\]* = 4.*$gdb_prompt $" {
+ set target_sizeof_long 4
+ # pass silently
+ }
+ -re ".\[0-9\]* = 8.*$gdb_prompt $" {
+ set target_sizeof_long 8
+ # pass silently
+ }
}
-}
-gdb_test_multiple "print sizeof (int)" "getting sizeof int" {
- -re ".\[0-9\]* = 2.*$gdb_prompt $" {
- set target_sizeof_int 2
- # pass silently
- }
- -re ".\[0-9\]* = 4.*$gdb_prompt $" {
- set target_sizeof_int 4
- # pass silently
- }
- -re ".\[0-9\]* = 8.*$gdb_prompt $" {
- set target_sizeof_int 8
- # pass silently
+ gdb_test_multiple "print sizeof (int)" "getting sizeof int" {
+ -re ".\[0-9\]* = 2.*$gdb_prompt $" {
+ set target_sizeof_int 2
+ # pass silently
+ }
+ -re ".\[0-9\]* = 4.*$gdb_prompt $" {
+ set target_sizeof_int 4
+ # pass silently
+ }
+ -re ".\[0-9\]* = 8.*$gdb_prompt $" {
+ set target_sizeof_int 8
+ # pass silently
+ }
}
-}
-switch [get_endianness] {
- little { set target_bigendian_p 0 }
- big { set target_bigendian_p 1 }
-}
+ switch [get_endianness] {
+ little { set target_bigendian_p 0 }
+ big { set target_bigendian_p 1 }
+ }
-# Perform tests
+ # Perform tests
-gdb_test_no_output "set print frame-arguments all"
+ gdb_test_no_output "set print frame-arguments all"
-integral_args
-unsigned_integral_args
-if {$allow_float_test} {
- float_and_integral_args
-}
+ integral_args
+ unsigned_integral_args
+ if {$allow_float_test} {
+ float_and_integral_args
+ }
-# Test _Complex type here if supported.
-if {[support_complex_tests]} {
- complex_args
+ # Test _Complex type here if supported.
+ if {[support_complex_tests]} {
+ complex_args
- complex_integral_args
+ complex_integral_args
- if {$allow_float_test} {
- complex_float_integral_args
+ if {$allow_float_test} {
+ complex_float_integral_args
+ }
}
-}
-pointer_args
-structs_by_reference
-structs_by_value
-discard_and_shuffle
-shuffle_round_robin
-recursive_structs_by_value
-localvars_after_alloca
-call_after_alloca
-localvars_in_indirect_call
-stepping_over_trampolines
-
-set timeout $prev_timeout
+ pointer_args
+ structs_by_reference
+ structs_by_value
+ discard_and_shuffle
+ shuffle_round_robin
+ recursive_structs_by_value
+ localvars_after_alloca
+ call_after_alloca
+ localvars_in_indirect_call
+ stepping_over_trampolines
+}
--
2.53.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-10-06 12:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-06 12:50 [pushed] gdb/testsuite: use with_timeout_factor in 2 more tests Jan Vrany
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox