diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 22 |
2 files changed, 17 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index a9682265a..273d93137 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ strongswan (5.2.1-2) UNRELEASED; urgency=medium - * Re-enable libtls test suite. + * Run the test suite only on amd64, i386, and s390x. It requires lots of + entropy and CPU time, which are typically hard to come by on slower + archs. + * Re-enable normal keylengths in test suite. + * Re-enable libtls tests. * Update Dutch translation, thanks to Frans Spiesschaert (closes: #763798). * Bump Standards-Version to 3.9.6. - -- Romain Francoise <rfrancoise@debian.org> Wed, 22 Oct 2014 20:58:40 +0200 + -- Romain Francoise <rfrancoise@debian.org> Wed, 22 Oct 2014 21:06:49 +0200 strongswan (5.2.1-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 3fa0d2658..9d25beae0 100755 --- a/debian/rules +++ b/debian/rules @@ -33,17 +33,7 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \ # get the various DEB_BUILD/DEB_HOST variables include /usr/share/dpkg/architecture.mk -# use reduced keylength in testsuite for !linux and !x86 -ifneq ($(DEB_BUILD_ARCH_OS),linux) - export TESTS_REDUCED_KEYLENGTHS=true -endif -ifneq ($(DEB_BUILD_ARCH_CPU),i386) -ifneq ($(DEB_BUILD_ARCH_CPU),amd64) - export TESTS_REDUCED_KEYLENGTHS=true -endif -endif - -# the padlock plugin only makes sense on i386 +# the padlock plugin only makes sense on i386 # RdRand only makes sense on i386 and amd64 ifeq ($(DEB_BUILD_ARCH_CPU),i386) CONFIGUREARGS += --enable-padlock --enable-rdrand @@ -198,5 +188,15 @@ override_dh_makeshlibs: 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))) + dh_auto_test +endif + %: dh $@ --parallel --with autoreconf,systemd |