From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id B86493839DD1; Wed, 26 Oct 2022 15:29:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B86493839DD1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666798173; bh=MwOsciqsGTKWzz4Wh0CT5pwlOMz2tD/WaEWe+xb2l/c=; h=From:To:Subject:Date:From; b=OI45e0yVmBaq0Ev73+6kduwrg82X8TH9FMmc6Uq3soQeof6MZ01tAhD5fn981M5Gy uf39RCpK5WOWCK0vaDsJ3BBl6LMx/EIxWjSEcPmvlu68WOnqpE0hDMNbyNwH44lhw0 dXLxqa4v2QQFOoIa4wNt82Mw9oUwrpcY2+snvjNQ= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/testsuite: fix gdb.guile/scm-parameter.exp "wrong type argument" test pattern for Guile >= 2.2 X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 23295de1317433210cb0303ef304e68763607c78 X-Git-Newrev: ee7f721ea2f51cd6cda301ce6a68e84f61c31e0c Message-Id: <20221026152933.B86493839DD1@sourceware.org> Date: Wed, 26 Oct 2022 15:29:30 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dee7f721ea2f5= 1cd6cda301ce6a68e84f61c31e0c commit ee7f721ea2f51cd6cda301ce6a68e84f61c31e0c Author: Simon Marchi Date: Mon Oct 24 12:43:38 2022 -0400 gdb/testsuite: fix gdb.guile/scm-parameter.exp "wrong type argument" te= st pattern for Guile >=3D 2.2 =20 Since commit 90319cefe3 ("GDB/Guile: Don't assert that an integer value is boolean"), I see: =20 FAIL: gdb.guile/scm-parameter.exp: kind=3DPARAM_ZINTEGER: test-PARA= M_ZINTEGER-param: guile (set-parameter-value! test-PARAM_ZINTEGER-param #:u= nlimited) FAIL: gdb.guile/scm-parameter.exp: kind=3DPARAM_ZUINTEGER: test-PAR= AM_ZUINTEGER-param: guile (set-parameter-value! test-PARAM_ZUINTEGER-param = #:unlimited) =20 This comes from the fact that GDB outputs this: =20 ERROR: In procedure set-parameter-value!: In procedure gdbscm_set_parameter_value_x: Wrong type argument in p= osition 2 (expecting integer): #:unlimited Error while executing Scheme code. =20 while the test expects an additional "ERROR:" on the second line, something like this: =20 ERROR: In procedure set-parameter-value!: ERROR: In procedure gdbscm_set_parameter_value_x: Wrong type argume= nt in position 2 (expecting integer): #:unlimited Error while executing Scheme code. =20 Guile 2.0 outputs the `ERROR:` on the second line, while later versions do not. Change the pattern to accept both outputs. This is similar to commit 6bbe1a929c6 ("[gdb/testsuite] Fix gdb.guile/scm-breakpoint.exp with guile 3.0"). =20 Change-Id: I9dc45e7492a4f08340cad974610242ed689de959 Diff: --- gdb/testsuite/gdb.guile/scm-parameter.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.= guile/scm-parameter.exp index b9f2d825211..0b2076c4057 100644 --- a/gdb/testsuite/gdb.guile/scm-parameter.exp +++ b/gdb/testsuite/gdb.guile/scm-parameter.exp @@ -183,10 +183,10 @@ foreach_with_prefix kind { "end" =20 set param_integer_error \ - "ERROR: In procedure set-parameter-value!:\r\nERROR: In procedure\ - gdbscm_set_parameter_value_x: Wrong type argument in position 2\ - \\(expecting integer\\): #:unlimited\r\nError while executing Scheme\ - code\\." + [multi_line \ + "ERROR: In procedure set-parameter-value!:" \ + "(ERROR: )?In procedure gdbscm_set_parameter_value_x: Wrong type argu= ment in position 2 \\(expecting integer\\): #:unlimited" \ + "Error while executing Scheme code\\."] set param_minus_one_error "integer -1 out of range" set param_minus_two_range "integer -2 out of range" set param_minus_two_unlimited "only -1 is allowed to set as unlimited"