| Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 1 | From 5bf89c6a314952313b2b762fff0d5501fe57ac53 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 2 Dec 2020 21:21:52 +0000 |
| 4 | Subject: [PATCH] tests/shader.py: sort the file list before working on it |
| 5 | |
| 6 | This allows later xml output to be reproducible. |
| 7 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 8 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610] |
| Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 10 | --- |
| 11 | tests/shader.py | 4 +++- |
| 12 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/tests/shader.py b/tests/shader.py |
| 15 | index 849273660..e6e65d1ba 100644 |
| 16 | --- a/tests/shader.py |
| 17 | +++ b/tests/shader.py |
| 18 | @@ -52,7 +52,9 @@ for basedir in [TESTS_DIR, GENERATED_TESTS_DIR]: |
| 19 | for group, files in shader_tests.items(): |
| 20 | assert group not in profile.test_list, 'duplicate group: {}'.format(group) |
| 21 | |
| 22 | - # We'll end up with a list of tuples, split that into two lists |
| 23 | + # This makes the xml output reproducible, as os.walk() order is random |
| 24 | + files.sort() |
| 25 | + # We'll end up with a list of tuples, split that into two list |
| 26 | files, installedfiles = list(zip(*files)) |
| 27 | files = list(files) |
| 28 | installedfiles = list(installedfiles) |