Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 1 | From 9086d42df1f3134bafcfe33ff16db7bbb9d9a0fd Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 30 Nov 2020 23:08:22 +0000 |
| 4 | Subject: [PATCH] framework/profile.py: make test lists reproducible |
| 5 | |
| 6 | These are created with os.walk, which yields different |
| 7 | order depending on where it's run. |
| 8 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610] |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | --- |
| 12 | framework/profile.py | 6 +++++- |
| 13 | 1 file changed, 5 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/framework/profile.py b/framework/profile.py |
| 16 | index c210e535e..9b5d51d68 100644 |
| 17 | --- a/framework/profile.py |
| 18 | +++ b/framework/profile.py |
| 19 | @@ -528,7 +528,11 @@ class TestProfile(object): |
| 20 | else: |
| 21 | opts[n] = self.test_list[n] |
| 22 | else: |
| 23 | - opts = self.test_list # pylint: disable=redefined-variable-type |
| 24 | + opts = collections.OrderedDict() |
| 25 | + test_keys = list(self.test_list.keys()) |
| 26 | + test_keys.sort() |
| 27 | + for k in test_keys: |
| 28 | + opts[k] = self.test_list[k] |
| 29 | |
| 30 | for k, v in self.filters.run(opts.items()): |
| 31 | yield k, v |