diff options
| author | Tom de Vries <tdevries@suse.de> | 2025-06-25 12:37:35 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2025-06-25 12:37:35 +0200 |
| commit | 4d4bb30b41aaf902e4ad21e4b314950c705447bc (patch) | |
| tree | 258585755ff5b84e07f6f931128c308414dff5c5 /gdb/testsuite/gdb.python | |
| parent | 86a053ddd1e2534c588d8d6f56752fb51dd1b184 (diff) | |
| download | binutils-4d4bb30b41aaf902e4ad21e4b314950c705447bc.zip binutils-4d4bb30b41aaf902e4ad21e4b314950c705447bc.tar.gz binutils-4d4bb30b41aaf902e4ad21e4b314950c705447bc.tar.bz2 | |
[gdb/testsuite] Fix gdb.python/py-warning.exp with python 3.6
On openSUSE Tumbleweed (with python 3.13), I get:
...
(gdb) PASS: gdb.python/py-warning.exp: python gdb.warning("")
python gdb.warning()^M
Python Exception <class 'TypeError'>: \
function missing required argument 'text' (pos 1)^M
Error occurred in Python: function missing required argument 'text' (pos 1)^M
(gdb) PASS: gdb.python/py-warning.exp: python gdb.warning()
...
But on openSUSE Leap 15.6 (with python 3.6), I get instead:
...
(gdb) PASS: gdb.python/py-warning.exp: python gdb.warning("")
python gdb.warning()^M
Python Exception <class 'TypeError'>: \
Required argument 'text' (pos 1) not found^M
Error occurred in Python: Required argument 'text' (pos 1) not found^M
(gdb) FAIL: gdb.python/py-warning.exp: python gdb.warning()
...
Fix this by updating the regexp.
Tested on x86_64-linux.
PR testsuite/33104
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33104
Diffstat (limited to 'gdb/testsuite/gdb.python')
| -rw-r--r-- | gdb/testsuite/gdb.python/py-warning.exp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/gdb/testsuite/gdb.python/py-warning.exp b/gdb/testsuite/gdb.python/py-warning.exp index b0256fa..6b26a4e 100644 --- a/gdb/testsuite/gdb.python/py-warning.exp +++ b/gdb/testsuite/gdb.python/py-warning.exp @@ -40,7 +40,24 @@ gdb_test "python gdb.warning(\"\")" \ "Error occurred in Python: Empty text string passed to gdb\\.warning"] # Missing argument gives an error. -gdb_test "python gdb.warning()" \ +set re1 \ [multi_line \ - "Python Exception <class 'TypeError'>: function missing required argument 'text' \\(pos 1\\)" \ - "Error occurred in Python: function missing required argument 'text' \\(pos 1\\)"] + [string_to_regexp \ + [concat \ + "Python Exception <class 'TypeError'>:" \ + "function missing required argument 'text' (pos 1)"]] \ + [string_to_regexp \ + [concat \ + "Error occurred in Python:" \ + "function missing required argument 'text' (pos 1)"]]] +set re2 \ + [multi_line \ + [string_to_regexp \ + [concat \ + "Python Exception <class 'TypeError'>:" \ + "Required argument 'text' (pos 1) not found"]] \ + [string_to_regexp \ + [concat \ + "Error occurred in Python:" \ + "Required argument 'text' (pos 1) not found"]]] +gdb_test "python gdb.warning()" $re1|$re2 |