summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Francoise <rfrancoise@debian.org>2014-10-24 21:08:53 +0200
committerRomain Francoise <rfrancoise@debian.org>2014-10-24 21:08:53 +0200
commit6766cf1f703cd06fd82c37d1908aae561d9c068f (patch)
treeb90645674c22de95a05389b3cdace27eaa2c740c
parent899ca346cb49af426aa1518e2b6a0d4aa0fb2fd4 (diff)
downloadvyos-strongswan-6766cf1f703cd06fd82c37d1908aae561d9c068f.tar.gz
vyos-strongswan-6766cf1f703cd06fd82c37d1908aae561d9c068f.zip
Run the test suite only on amd64
If we want to make the cut for the freeze on Nov 5th, the package needs to build on all archs right now, so let's just disable the test suite on buildds and we can experiment later...
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules7
2 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 59644ebd5..1cf00501c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+strongswan (5.2.1-4) unstable; urgency=medium
+
+ * Give up on trying to run the test suite on !amd64, it now times out on
+ both i386 and s390x, our chosen "fast" archs.
+
+ -- Romain Francoise <rfrancoise@debian.org> Fri, 24 Oct 2014 21:08:17 +0200
+
strongswan (5.2.1-3) unstable; urgency=medium
* Disable libtls tests again, they are still too intensive for the buildd
diff --git a/debian/rules b/debian/rules
index 9d25beae0..ba9eefab7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,12 +189,7 @@ override_dh_installlogcheck:
dh_installlogcheck --name strongswan
override_dh_auto_test:
-# run the test suite only on fast archs, but try to get some portability
-# coverage by running on:
-# - amd64 (64-bit, little-endian)
-# - i386 (32-bit, little-endian)
-# - s390x (64-bit, big-endian)
-ifneq (,$(filter amd64 i386 s390x,$(DEB_BUILD_ARCH)))
+ifeq ($(DEB_BUILD_ARCH),amd64)
dh_auto_test
endif