From 5a899c6545b717ca2d964c71ed8bb17cde54fb49 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 6 Nov 2023 09:44:29 +0000 Subject: [PATCH] Really skip test-admin-deploy-uboot.sh on s390x --- .../debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch b/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch index f79722f1..f147aa5f 100644 --- a/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch +++ b/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch @@ -12,14 +12,14 @@ Forwarded: no 1 file changed, 5 insertions(+) diff --git a/tests/test-admin-deploy-uboot.sh b/tests/test-admin-deploy-uboot.sh -index 9a4d773..2f1809f 100755 +index 9a4d773..772e51d 100755 --- a/tests/test-admin-deploy-uboot.sh +++ b/tests/test-admin-deploy-uboot.sh @@ -20,6 +20,11 @@ set -euo pipefail -+if [ "${DEB_HOST_ARCH-}" = s390x ]; then ++if [ "${DEB_HOST_ARCH-$(dpkg --print-architecture)}" = s390x ]; then + echo "1..0 # SKIP uBoot not supported on s390x" + exit 0 +fi -- 2.30.2