aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@efficios.com>2022-10-24 12:43:38 -0400
committerSimon Marchi <simon.marchi@polymtl.ca>2022-10-26 11:23:40 -0400
commitee7f721ea2f51cd6cda301ce6a68e84f61c31e0c (patch)
tree12cd47313f9980fc8556d0d89d1c427a45753031 /gdb/testsuite
parent23295de1317433210cb0303ef304e68763607c78 (diff)
downloadgdb-ee7f721ea2f51cd6cda301ce6a68e84f61c31e0c.zip
gdb-ee7f721ea2f51cd6cda301ce6a68e84f61c31e0c.tar.gz
gdb-ee7f721ea2f51cd6cda301ce6a68e84f61c31e0c.tar.bz2
gdb/testsuite: fix gdb.guile/scm-parameter.exp "wrong type argument" test pattern for Guile >= 2.2
Since commit 90319cefe3 ("GDB/Guile: Don't assert that an integer value is boolean"), I see: FAIL: gdb.guile/scm-parameter.exp: kind=PARAM_ZINTEGER: test-PARAM_ZINTEGER-param: guile (set-parameter-value! test-PARAM_ZINTEGER-param #:unlimited) FAIL: gdb.guile/scm-parameter.exp: kind=PARAM_ZUINTEGER: test-PARAM_ZUINTEGER-param: guile (set-parameter-value! test-PARAM_ZUINTEGER-param #:unlimited) This comes from the fact that GDB outputs this: ERROR: In procedure set-parameter-value!: In procedure gdbscm_set_parameter_value_x: Wrong type argument in position 2 (expecting integer): #:unlimited Error while executing Scheme code. while the test expects an additional "ERROR:" on the second line, something like this: ERROR: In procedure set-parameter-value!: ERROR: In procedure gdbscm_set_parameter_value_x: Wrong type argument in position 2 (expecting integer): #:unlimited Error while executing Scheme code. 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"). Change-Id: I9dc45e7492a4f08340cad974610242ed689de959
Diffstat (limited to 'gdb/testsuite')
-rw-r--r--gdb/testsuite/gdb.guile/scm-parameter.exp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.guile/scm-parameter.exp
index b9f2d82..0b2076c 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"
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 argument 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"