diff options
| -rwxr-xr-x | debian/bin/gencontrol.py | 15 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/templates/tests-control.headers.in | 1 |
3 files changed, 9 insertions, 9 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index b6bed381c..b5c1d50c1 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -570,17 +570,14 @@ class Gencontrol(Base): self.tests_control.append(tests_control) if flavour == (self.quick_flavour or self.default_flavour): - tests_control = self.process_package( - self.templates['tests-control.headers'][0], vars) - tests_control['Depends'].append( + if not self.tests_control_headers: + self.tests_control_headers = self.process_package( + self.templates['tests-control.headers'][0], vars) + self.tests_control.append(self.tests_control_headers) + self.tests_control_headers['Architecture'].add(arch) + self.tests_control_headers['Depends'].append( PackageRelationGroup(package_headers['Package'], override_arches=(arch,))) - if self.tests_control_headers: - self.tests_control_headers['Depends'].extend( - tests_control['Depends']) - else: - self.tests_control_headers = tests_control - self.tests_control.append(tests_control) def get_config(*entry_name): entry_real = ('image',) + entry_name diff --git a/debian/changelog b/debian/changelog index d0e03c3d2..75a8dbc27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ linux (5.18.14-2) UNRELEASED; urgency=medium * d/tests: kbuild test case depends on python3 * d/tests: Run kbuild test with default flavour if quick flavour not defined * d/lib/python/debian_linux/debian.py: Add Architecture field to TestsControl + * d/tests: Restrict kbuild tests to architectures with default or quick + flavour -- Ben Hutchings <benh@debian.org> Fri, 29 Jul 2022 00:43:54 +0200 diff --git a/debian/templates/tests-control.headers.in b/debian/templates/tests-control.headers.in index 028136d8e..f56894d8d 100644 --- a/debian/templates/tests-control.headers.in +++ b/debian/templates/tests-control.headers.in @@ -1,3 +1,4 @@ Tests: kbuild +Architecture: Depends: python3 Restrictions: superficial |