From 25cf7d2ed75ba8d2837b2ddb49faa4181be28906 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 24 Mar 2023 16:04:10 +0100 Subject: [PATCH] chore(linux): Revert "Run and ignore autopkgtests on s390x" This reverts commit 2f716b3e517ecc4ad4c3a86479533d37fc55a4bc. (cherry picked from commit 7a9f366c6a2b278c68e5e8421563908821125a94) --- linux/debian/changelog | 6 ++++++ linux/debian/tests/control | 2 +- linux/debian/tests/test-build | 8 -------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/linux/debian/changelog b/linux/debian/changelog index 0366f33d58..9f69cc9a12 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +keyman (16.0.139-4) unstable; urgency=medium + + * debian/tests: Revert previous change and ignore s390x from autopkgtests + + -- Eberhard Beilharz Fri, 24 Mar 2023 16:05:07 +0100 + keyman (16.0.139-3) unstable; urgency=medium * debian/tests: Run autopkgtests on s390x but immediately return diff --git a/linux/debian/tests/control b/linux/debian/tests/control index 904f4536c7..c1164c9c8e 100644 --- a/linux/debian/tests/control +++ b/linux/debian/tests/control @@ -2,4 +2,4 @@ Tests: test-build Depends: @, build-essential, pkg-config, -Architecture: any +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 diff --git a/linux/debian/tests/test-build b/linux/debian/tests/test-build index cc9b4f6626..db0a343849 100644 --- a/linux/debian/tests/test-build +++ b/linux/debian/tests/test-build @@ -9,14 +9,6 @@ WORKDIR=$(mktemp -d) trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM cd "$WORKDIR" -if [ "$(dpkg --print-architecture)" == "s390x" ]; then - # libkmnkbp doesn't support big endian architectures - # (https://github.com/keymanapp/keyman/issues/5111), so it isn't - # build on s390x and we can't run the tests. Simply ignore. - echo "Not supported on s390x: OK" - exit 0 -fi - # Test all include files are available cat < keymantest.c #include