From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id B26D33858D20; Fri, 2 Dec 2022 07:56:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B26D33858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669967806; bh=7xeK9RCQKR68Plr8yIGkSthpk59JJ90/XG5r38PcCYw=; h=From:To:Subject:Date:From; b=VEWkp5LweFGsfqVuSuU8H51J100sYm9ICukzoK43MnCVytKP+0/AlhPx3ypuKf0ne Do7TKr6xNllzfrvLYtMzbWmZY153as+n04YYMyzJ+E1z1BjyehW6UONYnXB1yKgG9T Xh/PRZz1cidCDYDMaof93WwO1joFsx1WmK8aRifs= 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] Prevent timeout in gdb.ada/float-bits.exp X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: aaa8dbc1b31233f66131476e03ab8635805e515d X-Git-Newrev: 63dc62b25880d4eeabb9eb3a5d691043b2723dd5 Message-Id: <20221202075646.B26D33858D20@sourceware.org> Date: Fri, 2 Dec 2022 07:56:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D63dc62b25880= d4eeabb9eb3a5d691043b2723dd5 commit 63dc62b25880d4eeabb9eb3a5d691043b2723dd5 Author: Tom de Vries Date: Fri Dec 2 08:56:42 2022 +0100 [gdb/testsuite] Prevent timeout in gdb.ada/float-bits.exp =20 Recent commit 32a5aa26256 ("[gdb/testsuite] Fix gdb.ada/float-bits.exp for powerpc64le") started using command "maint print architecture", whi= ch produces ~275 lines. =20 Rewrite the corresponding gdb_test_multiple to read line-by-line, to pr= event timeouts on slower test setups. =20 Note that this doesn't fix a timeout in the test-case on aarch64 due to: ... gdbarch_dump: read_core_file_mappings =3D <0x817438> (gdb) aarch64_dump_tdep: Lowest pc =3D 0x0x8000 ... =20 Tested on x86_64-linux. Diff: --- gdb/testsuite/gdb.ada/float-bits.exp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.ada/float-bits.exp b/gdb/testsuite/gdb.ada/f= loat-bits.exp index 921fe36a4bd..dab16a60286 100644 --- a/gdb/testsuite/gdb.ada/float-bits.exp +++ b/gdb/testsuite/gdb.ada/float-bits.exp @@ -75,14 +75,21 @@ set gdb_long_double_size [float_size "16llf#0#" ] =20 # Get the used long double format. set long_double_format "" -gdb_test_multiple "maint print architecture" "" { - -re "\r\ngdbarch_dump: long_double_format =3D (\[^\r\n\]*)" { +set cmd "maint print architecture" +gdb_test_multiple $cmd "" { + -re "^[string_to_regexp $cmd](?=3D\r\n)" { + exp_continue + } + -re "^\r\ngdbarch_dump: long_double_format =3D (\[^\r\n\]*)(?=3D\r\n)"= { set long_double_format $expect_out(1,string) exp_continue } - -re -wrap "" { + -re "^\r\n$gdb_prompt $" { pass $gdb_test_name } + -re "^\r\n(\[^\r\n\]*)(?=3D\r\n)" { + exp_continue + } } =20 # Set default values for 128-bit IEEE quad long doubles.