[rtems-tools commit] tester/bsp-builder: Fix the build jobs with more than one BSP exclude.
Chris Johns
chrisj at rtems.org
Tue Sep 4 00:19:42 UTC 2018
Module: rtems-tools
Branch: master
Commit: 0813c87480aa6209a6c32f9952dd02ab057696c5
Changeset: http://git.rtems.org/rtems-tools/commit/?id=0813c87480aa6209a6c32f9952dd02ab057696c5
Author: Chris Johns <chrisj at rtems.org>
Date: Tue Sep 4 10:15:46 2018 +1000
tester/bsp-builder: Fix the build jobs with more than one BSP exclude.
Excluding more than one build resulted in common builds being removed
resulting in a list remove error.
---
tester/rt/check.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tester/rt/check.py b/tester/rt/check.py
index e978869..36eca39 100755
--- a/tester/rt/check.py
+++ b/tester/rt/check.py
@@ -1195,13 +1195,15 @@ class build_jobs:
self.builds = config.builds()
if self.builds is None:
raise error.general('build not found: %s' % (config.build()))
- excludes = set(config.excludes(self.arch) +
- config.bsp_excludes(self.arch, self.bsp))
+ excludes = list(set(config.excludes(self.arch) +
+ config.bsp_excludes(self.arch, self.bsp)))
+ #
+ # The build can be in the buld string delimited by '-'.
+ #
remove = []
for e in excludes:
remove += [b for b in self.builds if e in b]
- for b in remove:
- self.builds.remove(b)
+ self.builds = [b for b in self.builds if b not in remove]
self.build_set = { }
for build in self.builds:
self.build_set[build] = config.build_options(build)
More information about the vc
mailing list