From 7e21379963c8be351a03693ce64d0a597ea0dbd7 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 14 Nov 2022 10:10:04 -0500 Subject: [PATCH] gdb/testsuite: get_set_option_choices: expect \r\n after each item I get some random failures since commit 8d45c3a82a0e ("[gdb/testsuite] Set completions to unlimited in get_set_option_choices"), which can be reproduced with: $ make check-read1 TESTS="gdb.base/parse_number.exp" For instance: set architecture A^M Ambiguous item "A".^M (gdb) FAIL: gdb.base/parse_number.exp: arch=A: set architecture A The problem is the regexp in get_set_option_choices, it is possible that is only matches part of a completion result. With check-read1, that is always one letter. Fix this by expecting the \r\n at the end of the line, so we only match entire results. Use ^ in match patterns to ensure we don't miss any output. Approved-By: Tom de Vries Change-Id: Ib1733737feab7dde0f7095866e089081a891054e --- gdb/testsuite/lib/gdb.exp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 0543da31da6..698b3f4bd79 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9156,11 +9156,16 @@ proc get_set_option_choices {set_cmd} { with_set max-completions unlimited { gdb_test_multiple $cmd $test { - -re "\r\n$set_cmd (\[^\r\n\]+)" { + -re "^[string_to_regexp $cmd]\r\n" { + exp_continue + } + + -re "^$set_cmd (\[^\r\n\]+)\r\n" { lappend values $expect_out(1,string) exp_continue } - -re -wrap "" { + + -re "^$::gdb_prompt $" { pass $gdb_test_name } } -- 2.30.2