From a030767a071e475f44cea9e2370516045d8285de Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Wed, 10 Nov 2021 01:03:33 -0500 Subject: d/rules: Skip tests on s390x. --- debian/rules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 883bf9c..3d06bc1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ # export DH_VERBOSE=1 DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/default.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed @@ -13,6 +13,8 @@ export BARRIER_VERSION_STAGE=Release ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) CONFIGURE_FLAGS += -DBARRIER_BUILD_TESTS=no +else ifneq (,$(filter s390x,$(DEB_HOST_ARCH))) + CONFIGURE_FLAGS += -DBARRIER_BUILD_TESTS=no endif %: @@ -22,6 +24,8 @@ override_dh_auto_configure: dh_auto_configure --builddirectory=builddir -- -DBARRIER_USE_EXTERNAL_GTEST=ON $(CONFIGURE_FLAGS) override_dh_auto_test: +ifeq (,$(filter s390x,$(DEB_HOST_ARCH))) builddir/bin/guiunittests xvfb-run -a builddir/bin/integtests builddir/bin/unittests +endif -- cgit v1.2.3