From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 8014E3858C52; Mon, 14 Nov 2022 11:12:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8014E3858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668424344; bh=L3Q1TCGBpFMFFPpKyFaYUdIBRshBltuz8s8ToIDUp38=; h=From:To:Subject:Date:From; b=gmKy2ENpv+NkyCJwn5wUCSEEm2NDl3xCQpv3DA24MVGwfdDfuTUZV2ZVlONv6iL4d Mptzjx5FFD6DPlbNZI/WpREksTKGX9dINkwG2GlkcwXbcZtY0mL+ugv3UntGzQYZlE PFF17+JlOU8Ub3uvKRDF+yTqO9Kqls7kMsLPCXj4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Set completions to unlimited in get_set_option_choices X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: fadfefbf159291a685c9849ebf597c1d4d7f75dc X-Git-Newrev: 8d45c3a82a0eb5ecfc9049bed5569f9e27e3be8c Message-Id: <20221114111224.8014E3858C52@sourceware.org> Date: Mon, 14 Nov 2022 11:12:24 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D8d45c3a82a0e= b5ecfc9049bed5569f9e27e3be8c commit 8d45c3a82a0eb5ecfc9049bed5569f9e27e3be8c Author: Tom de Vries Date: Mon Nov 14 12:12:19 2022 +0100 [gdb/testsuite] Set completions to unlimited in get_set_option_choices =20 In some test-case I tried to use get_set_option_choices "set architectu= re" and ran into max-completions: ... set architecture simple^M set architecture tomcat^M set architecture xscale^M set architecture *** List may be truncated, max-completions reached. *= **^M (gdb) PASS: gdb.base/foo.exp: complete set architecture ... =20 There's only one test-case using this currently: gdb.base/parse_number.= exp, and it locally sets max-completions to unlimited. =20 Fix this by: - factoring out a new proc with_set out of proc with_complaints, and - using it to temporarily set max-completions to unlimited in get_set_option_choice. =20 Tested on x86_64-linux, by running test-cases that excercise get_set_option_choice and with_complaints. Diff: --- gdb/testsuite/gdb.base/parse_number.exp | 10 +++--- gdb/testsuite/lib/gdb.exp | 54 +++++++++++++++++++----------= ---- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/gdb/testsuite/gdb.base/parse_number.exp b/gdb/testsuite/gdb.ba= se/parse_number.exp index 70b0ad065d7..06bf1cd1714 100644 --- a/gdb/testsuite/gdb.base/parse_number.exp +++ b/gdb/testsuite/gdb.base/parse_number.exp @@ -346,18 +346,16 @@ proc test_parse_numbers {arch} { =20 clean_restart =20 -gdb_test_no_output "set language unknown" -gdb_test "p/x 0" \ - "expression parsing not implemented for language \"Unknown\"" - -gdb_test_no_output "set max-completions unlimited" - set supported_archs [get_set_option_choices "set architecture"] # There should be at least one more than "auto". gdb_assert {[llength $supported_archs] > 1} "at least one architecture" =20 set all_languages [get_set_option_choices "set language"] =20 +gdb_test_no_output "set language unknown" +gdb_test "p/x 0" \ + "expression parsing not implemented for language \"Unknown\"" + # If 1, test each arch. If 0, test one arch for each sizeof # short/int/long/longlong configuration. # For a build with --enable-targets=3Dall, full_arch_testing =3D=3D 0 take= s 15s, diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 1240c2ef6f3..40a7c7728d1 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5911,34 +5911,31 @@ proc gdb_load { arg } { } =20 # -# with_complaints -- Execute BODY and set complaints temporary to N for the +# with_set -- Execute BODY and set VAR temporary to VAL for the # duration. # -proc with_complaints { n body } { - global decimal - - # Save current setting of complaints. +proc with_set { var val body } { set save "" - set show_complaints_re \ - "Max number of complaints about incorrect symbols is ($decimal)\\." - gdb_test_multiple "show complaints" "" { - -re -wrap $show_complaints_re { + set show_re \ + "is (\[^\r\n\]+)\\." + gdb_test_multiple "show $var" "" { + -re -wrap $show_re { set save $expect_out(1,string) } } =20 if { $save =3D=3D "" } { - perror "Did not manage to set complaints" + perror "Did not manage to set $var" } else { - # Set complaints. - gdb_test_no_output -nopass "set complaints $n" + # Set var. + gdb_test_no_output -nopass "set $var $val" } =20 set code [catch {uplevel 1 $body} result] =20 - # Restore saved setting of complaints. + # Restore saved setting. if { $save !=3D "" } { - gdb_test_no_output -nopass "set complaints $save" + gdb_test_no_output -nopass "set $var $save" } =20 if {$code =3D=3D 1} { @@ -5949,6 +5946,14 @@ proc with_complaints { n body } { } } =20 +# +# with_complaints -- Execute BODY and set complaints temporary to N for the +# duration. +# +proc with_complaints { n body } { + return [uplevel [list with_set complaints $n $body]] +} + # # gdb_load_no_complaints -- As gdb_load, but in addition verifies that # loading caused no symbol reading complaints. @@ -9108,20 +9113,23 @@ gdb_caching_proc has_hw_wp_support { # Return a list of all the accepted values of the set command SET_CMD. =20 proc get_set_option_choices {set_cmd} { - global gdb_prompt - set values {} =20 + set cmd "complete $set_cmd " set test "complete $set_cmd" - gdb_test_multiple "complete $set_cmd " "$test" { - -re "$set_cmd (\[^\r\n\]+)\r\n" { - lappend values $expect_out(1,string) - exp_continue - } - -re "$gdb_prompt " { - pass $test + + with_set max-completions unlimited { + gdb_test_multiple $cmd $test { + -re "\r\n$set_cmd (\[^\r\n\]+)" { + lappend values $expect_out(1,string) + exp_continue + } + -re -wrap "" { + pass $gdb_test_name + } } } + return $values }