Package: swupdate
Version: 2020.04-2

The swupdate build still fails on mipsel and mips64el platforms due to
the test runs failing. My first patch was not effective, so I attached
another one.
From: Bastian Germann <[email protected]>
Date: Thu, 22 Oct 2020 17:49:18 +0200
Subject: Don't run unit tests on mips platforms

50dbd73d34b8 (Don't run unit tests on mips platforms) is not effective and
duplicates override_dh_auto_test. Use both the nocheck and mips conditions
in one override_dh_auto_test target.

Signed-off-by: Bastian Germann <[email protected]>
---
 debian/rules | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index b0c0823..e34c8e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@ export PKG_NAME=swupdate
 export DH_WITH=--with lua
 export HAVE_LUA=y
 endif
-ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
-export DEB_BUILD_MAINT_OPTIONS:=$(DEB_BUILD_MAINT_OPTIONS) nocheck
-endif
 
 override_dh_auto_configure:
 	cp debian/configs/defconfig  configs/debian_defconfig
@@ -52,7 +49,11 @@ endif
 	dh_auto_build -- V=1
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
+ifeq (,$(findstring mips,$(DEB_HOST_ARCH)))
 	dh_auto_test -- V=1
+endif
+endif
 
 override_dh_auto_install:
 	dh_auto_install -- V=1
@@ -73,9 +74,5 @@ override_dh_dwz:
 override_dh_missing:
 	dh_missing --fail-missing
 
-ifneq (,$(filter nocheck,$(DEB_BUILD_PROFILES)))
-override_dh_auto_test:
-endif
-
 %:
 	dh $@ $(DH_WITH)

Reply via email to