0a1,12
> # Copyright (c) 2019 ARM Limited
> # All rights reserved
> #
> # The license below extends only to copyright in the software and shall
> # not be construed as granting a license to any other intellectual
> # property including but not limited to intellectual property relating
> # to a hardware implementation of the functionality of the software
> # licensed hereunder. You may use the software subject to the license
> # terms below provided that you ensure that this notice is replicated
> # unmodified and in its entirety in all distributions of the software,
> # modified or unmodified, in source code or in binary form.
> #
182c194
< def __init__(self, suites, global_fixtures):
---
> def __init__(self, suites):
184d195
< self.global_fixtures = global_fixtures
199,203d209
< def all_fixture_tuples(self):
< return itertools.chain(
< self.global_fixtures,
< *(suite.fixtures for suite in self.obj))
<
210,211c216
< self.global_fixtures,
< *(suite.fixtures for suite in self.obj)),
---
> *(suite.fixtures for suite in self.obj)),
224c229,233
< return self.global_fixtures
---
> global_fixtures = []
> for fixture in self.all_fixtures():
> if fixture.is_global():
> global_fixtures.append(fixture)
> return global_fixtures