Commit f45bcbf1 authored by Jim Fulton's avatar Jim Fulton

Evaluate options in sorted order to avoid spurious test failures.

parent d426e325
...@@ -1083,7 +1083,7 @@ class Options(DictMixin): ...@@ -1083,7 +1083,7 @@ class Options(DictMixin):
self._raw = self._do_extend_raw(name, self._raw, []) self._raw = self._do_extend_raw(name, self._raw, [])
# force substitutions # force substitutions
for k, v in list(self._raw.items()): for k, v in sorted(self._raw.items()):
if '${' in v: if '${' in v:
self._dosub(k, v) self._dosub(k, v)
......
...@@ -137,10 +137,10 @@ It is an error to create a variable-reference cycle: ...@@ -137,10 +137,10 @@ It is an error to create a variable-reference cycle:
Initializing. Initializing.
Getting section buildout. Getting section buildout.
Initializing section buildout. Initializing section buildout.
Getting option buildout:x.
Getting option buildout:y. Getting option buildout:y.
Getting option buildout:z. Getting option buildout:z.
Getting option buildout:x. Getting option buildout:x.
Getting option buildout:y.
Error: Circular reference in substitutions. Error: Circular reference in substitutions.
It is an error to use funny characters in variable refereces: It is an error to use funny characters in variable refereces:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment