From 724d0dc04645b21865bcd1877b7cc77e9a3fe9b2 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Thu, 28 Apr 2022 17:13:07 +0100 Subject: testsuite: Deduplicate ways correctly This was leading to a bug where we would run a profasm test twice which led to invalid junit.xml which meant the test results database was not being populated for the fedora33-perf job. --- testsuite/driver/testlib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 9c9a1760a2..813e26f832 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -34,6 +34,7 @@ extra_src_files = {'T4198': ['exitminus1.c']} # TODO: See #12223 from my_typing import * from threading import Timer +from collections import OrderedDict global pool_sema if config.use_threads: @@ -1073,7 +1074,7 @@ def test_common_work(watcher: testutil.Watcher, all_ways = [WayName('normal')] # A test itself can request extra ways by setting opts.extra_ways - all_ways = all_ways + [way for way in opts.extra_ways if way not in all_ways] + all_ways = list(OrderedDict.fromkeys(all_ways + [way for way in opts.extra_ways if way not in all_ways])) t.total_test_cases += len(all_ways) -- cgit v1.2.1