[Pkg-gnupg-commit] [gnupg2] 07/07: enable tests to work on amd64

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit b361a04f330b16d8edd9f36a1dadb91873d4b3da
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Mar 30 01:11:46 2016 -0400

    enable tests to work on amd64
---
 debian/tests/control    |  3 ++-
 debian/tests/gpgv-win32 | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index 0330032..9178821 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,3 @@
 Tests: gpgv-win32
-Depends: gpgv-win32, wine, wine32, gpg2, gpgv2
+Depends: gpgv-win32, gnupg2, gpgv2
+Restrictions: needs-root, allow-stderr
diff --git a/debian/tests/gpgv-win32 b/debian/tests/gpgv-win32
index 8036099..3811743 100644
--- a/debian/tests/gpgv-win32
+++ b/debian/tests/gpgv-win32
@@ -4,6 +4,25 @@ set -e
 
 export GNUPGHOME=$(mktemp -d)
 
+arch=$(dpkg --print-architecture)
+
+case "$arch" in
+     amd64)
+          echo "I: setting up multiarch"
+          dpkg --add-architecture i386
+          apt-get update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
+          ;;
+     i386)
+          : nothing, tests should just work
+          ;;
+     *)
+          echo "I: skipping tests, only works on amd64 or i386"
+          exit
+          ;;
+esac
+
+DEBIAN_FRONTEND=noninteractive apt-get install -qy wine32 # FIXME ditto
+
 echo 'allow-loopback-pinentry:0:1' | gpgconf --change-options gpg-agent
 
 # Generate a minimal signing key:

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