aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2022-06-14 19:50:44 +0200
committerTom de Vries <tdevries@suse.de>2022-06-14 19:50:44 +0200
commit362a867f2ac16f597d06e8a9a3f6c15afa7adf6f (patch)
tree3746f969fad22b06e01b1cae84c24a75bc07dd58
parent965b71a7f739a747c6b427a96b1fa9dd26e38956 (diff)
downloadgdb-362a867f2ac16f597d06e8a9a3f6c15afa7adf6f.zip
gdb-362a867f2ac16f597d06e8a9a3f6c15afa7adf6f.tar.gz
gdb-362a867f2ac16f597d06e8a9a3f6c15afa7adf6f.tar.bz2
[gdb/testsuite] Handle unordered dict in gdb.python/py-mi-cmd.exp
When running test-case gdb.python/py-mi-cmd.exp on openSUSE Leap 42.3 with python 3.4, I occasionally run into: ... Expecting: ^(-pycmd dct[^M ]+)?(\^done,result={hello="world",times="42"}[^M ]+[(]gdb[)] ^M [ ]*) -pycmd dct^M ^done,result={times="42",hello="world"}^M (gdb) ^M FAIL: gdb.python/py-mi-cmd.exp: -pycmd dct (unexpected output) ... The problem is that the data type used here in py-mi-cmd.py: ... elif argv[0] == "dct": return {"result": {"hello": "world", "times": 42}} ... is a dictionary, and only starting version 3.6 are dictionaries insertion ordered, so using PyDict_Next in serialize_mi_result doesn't guarantee a fixed order. Fix this by allowing the alternative order. Tested on x86_64-linux.
-rw-r--r--gdb/testsuite/gdb.python/py-mi-cmd.exp4
1 files changed, 3 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.python/py-mi-cmd.exp b/gdb/testsuite/gdb.python/py-mi-cmd.exp
index d372518..7336860 100644
--- a/gdb/testsuite/gdb.python/py-mi-cmd.exp
+++ b/gdb/testsuite/gdb.python/py-mi-cmd.exp
@@ -54,8 +54,10 @@ mi_gdb_test "-pycmd ary" \
"\\^done,result=\\\[\"Hello\",\"42\"\\\]" \
"-pycmd ary"
+set re_order1 "\\^done,result={hello=\"world\",times=\"42\"}"
+set re_order2 "\\^done,result={times=\"42\",hello=\"world\"}"
mi_gdb_test "-pycmd dct" \
- "\\^done,result={hello=\"world\",times=\"42\"}" \
+ "($re_order1|$re_order2)" \
"-pycmd dct"
mi_gdb_test "-pycmd bk1" \