Ensure autopkgtest passes on armhf too

debian/changelog

@@ -4,7 +4,7 @@ python-bytecode (0.15.1-2) unstable; urgency=medium
   * Patch failing test on armhf - addresses #1056460 but does not fix it,
     as the cause is still unknown
 
- -- Julian Gilbey <jdg@debian.org>  Thu, 21 Dec 2023 12:45:04 +0000
+ -- Julian Gilbey <jdg@debian.org>  Thu, 21 Dec 2023 13:10:02 +0000
 
 python-bytecode (0.15.1-1) unstable; urgency=medium
 

debian/rules

@@ -24,13 +24,30 @@ override_dh_installdocs:
 	dh_installdocs --remaining-packages
 endif
 
+# armhf fails strangely; see https://bugs.debian.org/1056460
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_BUILD_ARCH),armhf)
 execute_before_dh_auto_test:
 	patch -p1 < debian/armhf.patch
 
 execute_after_dh_auto_test:
-        patch -p1 -R < debian/armhf.patch
+	patch -p1 -R < debian/armhf.patch
+endif
+endif
+
+# Need to hide the conditionals inside the targets, otherwise
+# pybuild-autopkgtest is likely to break on non-armhf architectures
+before-pybuild-autopkgtest:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq ($(DEB_BUILD_ARCH),armhf)
+	patch -p1 < debian/armhf.patch
+endif
+endif
+
+after-pybuild-autopkgtest:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq ($(DEB_BUILD_ARCH),armhf)
+	patch -p1 -R < debian/armhf.patch
 endif
 endif