aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-02-27 17:48:42 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-02-27 19:59:58 +0200
commit94fe01deec9b41ca3bfed3d04efc23ba50dd3cf5 (patch)
tree0170841138de842d7ac49cf3350d2e58e9495bbd
parentecdef0d005ba6be7849023379be6e8865ed8ffc8 (diff)
downloadmeson-94fe01deec9b41ca3bfed3d04efc23ba50dd3cf5.zip
meson-94fe01deec9b41ca3bfed3d04efc23ba50dd3cf5.tar.gz
meson-94fe01deec9b41ca3bfed3d04efc23ba50dd3cf5.tar.bz2
rewriter: Sort dict iterations to fix unit tests
-rw-r--r--mesonbuild/rewriter.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py
index f5f8b61..bd00ff8 100644
--- a/mesonbuild/rewriter.py
+++ b/mesonbuild/rewriter.py
@@ -427,7 +427,7 @@ class Rewriter:
**cdata.user_options
}
- for key, val in cmd['options'].items():
+ for key, val in sorted(cmd['options'].items()):
if key not in options:
mlog.error('Unknown options', mlog.bold(key), '--> skipping')
continue
@@ -474,7 +474,7 @@ class Rewriter:
# Print kwargs info
if cmd['operation'] == 'info':
info_data = {}
- for key, val in arg_node.kwargs.items():
+ for key, val in sorted(arg_node.kwargs.items()):
info_data[key] = None
if isinstance(val, mparser.ElementaryNode):
info_data[key] = val.value
@@ -492,7 +492,7 @@ class Rewriter:
# Modify the kwargs
num_changed = 0
- for key, val in cmd['kwargs'].items():
+ for key, val in sorted(cmd['kwargs'].items()):
if key not in kwargs_def:
mlog.error('Cannot modify unknown kwarg --> skipping', mlog.bold(key))
continue