[Pkg-gnupg-commit] [gnupg2] 102/112: make autopkgtest work with modern wine (Closes: #835976)

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 96bdd3719cad2e3bda1b92b13c7b1f77bb1e8e0e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Aug 30 04:05:40 2016 -0400

    make autopkgtest work with modern wine (Closes: #835976)
---
 debian/tests/gpgv-win32 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/tests/gpgv-win32 b/debian/tests/gpgv-win32
index 82a150a..94dd054 100644
--- a/debian/tests/gpgv-win32
+++ b/debian/tests/gpgv-win32
@@ -14,7 +14,14 @@ case "$arch" in
             apt-get update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
         fi
     ;;
-    i386)
+    arm64)
+        if ! dpkg --print-foreign-architectures | grep -Fqx armhf; then
+            echo "I: setting up multiarch"
+            dpkg --add-architecture armhf
+            apt-get update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
+        fi
+    ;;
+    i386|armel|armhf|powerpc)
         : nothing, tests should just work
         ;;
     *)
@@ -42,4 +49,4 @@ gpg2 --output "${0}.gpg" --detach-sign "${0}"
 gpgv2 --keyring "$GNUPGHOME/key.gpg" "${0}.gpg" "${0}"
 
 # Verify using gpgv.exe
-wine32 /usr/share/win32/gpgv.exe --keyring "Z:\\\\${GNUPGHOME}/key.gpg" "Z:\\\\$(pwd)/${0}.gpg" "Z:\\\\$(pwd)/${0}"
+wine /usr/share/win32/gpgv.exe --keyring "Z:\\\\${GNUPGHOME}/key.gpg" "Z:\\\\$(pwd)/${0}.gpg" "Z:\\\\$(pwd)/${0}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git