[PING][PATCHv4] gdb/testsuite: modernize gdb.base/maint.exp
Bruno Larsen
blarsen@redhat.com
Wed Jul 13 11:22:03 GMT 2022
ping!
Cheers!
Bruno Larsen
On 6/29/22 11:53, Bruno Larsen wrote:
> gdb.base/maint.exp was using several gdb_expect statements, probably
> because this test case predates the existance of gdb_test_multiple. This
> commit updates the test case to use gdb_test_multiple, making it more
> resilient to internal errors and such.
>
> The only gdb_expect left in the testcase is one that specifically looks
> for an internal error being triggered as a PASS.
> ---
>
> Changes for v4:
> * Reverted -lbl change, as it wouldn't make the pattern simpler
> * Simplified another psymbols test
>
> Changes for version 3:
> * changed patterns when testing psymbols, now using trailing
> parenthesis
> * used -lbl when running "check psymtabs"
> * made use of boolean variables and gdb_assert when testing
> psymtabs
> * Simplified msymbols and psymbosl test to 3 tests, instead of
> nested tests
>
> Changes for v2:
> - Addressed Andrew's comments
> - rebased on current master.
>
> ---
> gdb/testsuite/gdb.base/maint.exp | 146 ++++++++++---------------------
> 1 file changed, 45 insertions(+), 101 deletions(-)
>
> diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
> index 2817c6eafb9..16628b4a8b6 100644
> --- a/gdb/testsuite/gdb.base/maint.exp
> +++ b/gdb/testsuite/gdb.base/maint.exp
> @@ -151,22 +151,24 @@ set have_psyms [expr ! ( $have_gdb_index || $readnow_p )]
> # unless there is some problem with the symtabs and psymtabs
> # so that branch will really never be covered in this tests here!!
> #
> +# When there is a problem, there may be loads of output, which can
> +# overwhelm the expect buffer. Splitting it seems to fix those
> +# issues.
> +
> +set seen_command false
> +gdb_test_multiple "maint check-psymtabs" "" {
> + -re "^maint check-psymtabs\r\n" {
> + set seen_command true
> + exp_continue
> + }
>
> -# guo: on linux this command output is huge. for some reason splitting up
> -# the regexp checks works.
> -#
> -send_gdb "maint check-psymtabs\n"
> -gdb_expect {
> - -re "^maint check-psymtabs" {
> - gdb_expect {
> - -re "$gdb_prompt $" {
> - pass "maint check-psymtabs"
> - }
> - timeout { fail "(timeout) maint check-psymtabs" }
> - }
> + -re "^$gdb_prompt $" {
> + gdb_assert { $seen_command } $gdb_test_name
> + }
> +
> + -re "^\[^\r\n\]+\r\n" {
> + exp_continue
> }
> - -re ".*$gdb_prompt $" { fail "maint check-psymtabs" }
> - timeout { fail "(timeout) maint check-psymtabs" }
> }
>
> # This command does not produce any output unless there is some problem
> @@ -272,63 +274,29 @@ if { $have_psyms } {
> "maint print psymbols -pc" \
> "maint print psymbols -pc main $psymbols_output"]
> foreach { test_name command } $test_list {
> - send_gdb "$command\n"
> - gdb_expect {
> - -re "^maint print psymbols \[^\n\]*\r\n$gdb_prompt $" {
> - send_gdb "shell ls $psymbols_output\n"
> - gdb_expect {
> - -re "$psymbols_output_re\r\n$gdb_prompt $" {
> - # We want this grep to be as specific as possible,
> - # so it's less likely to match symbol file names in
> - # psymbols_output. Yes, this actually happened;
> - # poor expect got tons of output, and timed out
> - # trying to match it. --- Jim Blandy <jimb@cygnus.com>
> - send_gdb "shell grep 'main.*function' $psymbols_output\n"
> - gdb_expect {
> - -re ".main., function, $hex.*$gdb_prompt $" {
> - pass "$test_name 1"
> - }
> - -re ".*main. .., function, $hex.*$gdb_prompt $" {
> - pass "$test_name 2"
> - }
> - -re ".*$gdb_prompt $" { fail "$test_name" }
> - timeout { fail "$test_name (timeout)" }
> - }
> - gdb_test "shell rm -f $psymbols_output" ".*" \
> - "${test_name}: shell rm -f psymbols_output"
> - }
> - -re ".*$gdb_prompt $" { fail "$test_name" }
> - timeout { fail "$test_name (timeout)" }
> - }
> + gdb_test_no_output "$command" "collecting data for $test_name"
> + gdb_test_multiple "shell grep 'main.*function' $psymbols_output" "" {
> + -re -wrap ".main., function, $hex.*" {
> + pass "$test_name (pattern 1)"
> }
> - -re ".*$gdb_prompt $" { fail "$test_name" }
> - timeout { fail "$test_name (timeout)" }
> - }
> + -re -wrap ".*main. .., function, $hex.*" {
> + pass "$test_name (pattern 2)"
> + }
> + }
> + gdb_test "shell rm -f $psymbols_output" ".*" \
> + "${test_name}: shell rm -f psymbols_output"
> }
> }
>
>
> set msymbols_output [standard_output_file msymbols_output]
> set msymbols_output_re [string_to_regexp $msymbols_output]
> -send_gdb "maint print msymbols -objfile ${binfile} $msymbols_output\n"
> -gdb_expect {
> - -re "^maint print msymbols \[^\n\]*\r\n$gdb_prompt $" {
> - send_gdb "shell ls $msymbols_output\n"
> - gdb_expect {
> - -re "$msymbols_output_re\r\n$gdb_prompt $" {
> - gdb_test "shell grep factorial $msymbols_output" \
> - "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \
> - "maint print msymbols, absolute pathname"
> - gdb_test "shell rm -f $msymbols_output" ".*" \
> - "shell rm -f msymbols_output"
> - }
> - -re ".*$gdb_prompt $" { fail "maint print msymbols" }
> - timeout { fail "maint print msymbols (timeout)" }
> - }
> - }
> - -re ".*$gdb_prompt $" { fail "maint print msymbols" }
> - timeout { fail "maint print msymbols (timeout)" }
> -}
> +gdb_test_no_output "maint print msymbols -objfile ${binfile} $msymbols_output" \
> + "print msymbols to file, with absolute path"
> +gdb_test "shell grep factorial $msymbols_output" \
> + "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \
> + "maint print msymbols, absolute pathname"
> +gdb_test "shell rm -f $msymbols_output" ".*" "remove absolute path msymbols"
>
> # Check that maint print msymbols allows relative pathnames
> set mydir [pwd]
> @@ -336,18 +304,13 @@ gdb_test "cd [standard_output_file {}]" \
> "Working directory .*\..*" \
> "cd to objdir"
>
> -gdb_test_multiple "maint print msymbols -objfile ${testfile} msymbols_output2" "maint print msymbols" {
> - -re "^maint print msymbols \[^\n\]*\r\n$gdb_prompt $" {
> - gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" {
> - -re "msymbols_output2\r\n$gdb_prompt $" {
> - gdb_test "shell grep factorial msymbols_output2" \
> - "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \
> - "maint print msymbols, relative pathname"
> - gdb_test "shell rm -f msymbols_output2" ".*"
> - }
> - }
> - }
> -}
> +gdb_test_no_output "maint print msymbols -objfile ${testfile} $msymbols_output"\
> + "print msymbols to file, with relative path"
> +gdb_test "shell grep factorial $msymbols_output" \
> + "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \
> + "maint print msymbols, relative pathname"
> +gdb_test "shell rm -f msymbols_output" ".*" "remove relative path msymbols"
> +
> gdb_test "cd ${mydir}" \
> "Working directory [string_to_regexp ${mydir}]\..*" \
> "cd to mydir"
> @@ -365,31 +328,12 @@ set test_list [list \
> "maint print symbols -pc" \
> "maint print symbols -pc main $symbols_output"]
> foreach { test_name command } $test_list {
> - send_gdb "$command\n"
> - gdb_expect {
> - -re "^maint print symbols \[^\n\]*\r\n$gdb_prompt $" {
> - send_gdb "shell ls $symbols_output\n"
> - gdb_expect {
> - -re "$symbols_output_re\r\n$gdb_prompt $" {
> - # See comments for `maint print psymbols'.
> - send_gdb "shell grep 'main(.*block' $symbols_output\n"
> - gdb_expect {
> - -re "int main\\(int, char \\*\\*, char \\*\\*\\); block.*$gdb_prompt $" {
> - pass "$test_name"
> - }
> - -re ".*$gdb_prompt $" { fail "$test_name" }
> - timeout { fail "$test_name (timeout)" }
> - }
> - gdb_test "shell rm -f $symbols_output" ".*" \
> - "$test_name: shell rm -f symbols_output"
> - }
> - -re ".*$gdb_prompt $" { fail "$test_name" }
> - timeout { fail "$test_name (timeout)" }
> - }
> - }
> - -re ".*$gdb_prompt $" { fail "$test_name" }
> - timeout { fail "$test_name (timeout)" }
> - }
> + gdb_test_no_output "$command" "$test_name generate"
> + gdb_test "shell grep 'main(.*block' $symbols_output"\
> + "int main\\(int, char \\*\\*, char \\*\\*\\); block.*"\
> + "$test_name read"
> + gdb_test "shell rm -f $symbols_output" ".*" \
> + "$test_name: shell rm -f symbols_output"
> }
>
> set msg "maint print type"
More information about the Gdb-patches
mailing list