summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2021-12-10 20:22:09 -0500
committerLibravatarUnit 193 <unit193@unit193.net>2021-12-10 20:22:09 -0500
commit53e82093ae38ef858088fd14a7a1d1faf2d3714e (patch)
treee756a13eb042af09fa6b7dfd1fcf60e545d1d86e
parent11dc24764d1713fc4921455742a7572d99a49498 (diff)
d/rules: Restrict tests to amd64 and i386 due to intermittent failures.debian/2.4.0+dfsg-2
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules4
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 976e168..ede1254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+barrier (2.4.0+dfsg-2) unstable; urgency=medium
+
+ * d/rules: Restrict tests to amd64 and i386 due to intermittent failures.
+
+ -- Unit 193 <unit193@debian.org> Fri, 10 Dec 2021 20:22:00 -0500
+
barrier (2.4.0+dfsg-1) unstable; urgency=medium
* Happy 70th dad, may you rest in peace.
diff --git a/debian/rules b/debian/rules
index 2e0b32a..28e1566 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export BARRIER_VERSION_STAGE=Release
ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
CONFIGURE_FLAGS += -DBARRIER_BUILD_TESTS=no
-else ifneq (,$(filter s390x,$(DEB_HOST_ARCH)))
+else ifeq (,$(filter amd64 i386,$(DEB_HOST_ARCH)))
CONFIGURE_FLAGS += -DBARRIER_BUILD_TESTS=no
endif
@@ -23,7 +23,7 @@ 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)))
+ifneq (,$(filter amd64 i386,$(DEB_HOST_ARCH)))
builddir/bin/guiunittests
xvfb-run -a builddir/bin/integtests
builddir/bin/unittests