Rewrite tests/openpgp-certs/testselfsigs portably for Solaris. Fix EXTRA_DIST.

diff --git a/tests/openpgp-certs/Makefile.am b/tests/openpgp-certs/Makefile.am
index 17e97e6aa506554ec65318d7f8e817da1df93f98..eed927007e6ec55fad9570cee62e8f25a0678327 100644 (file)
--- a/tests/openpgp-certs/Makefile.am
+++ b/tests/openpgp-certs/Makefile.am
@@ -17,19 +17,19 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-if ENABLE_OPENPGP
-
 EXTRA_DIST = ca-public.gpg srv-public-all-signed.gpg srv-secret.gpg    \
        ca-secret.gpg srv-public.gpg srv-public-127.0.0.1-signed.gpg    \
-       srv-public-localhost-signed.gpg selfsigs/alice-mallory-badsig18.pub \
-       selfsigs/alice-mallory-irrelevantsig.pub selfsigs/alice-mallory-nosig18.pub \
-       selfsigs/alice.pub
+       srv-public-localhost-signed.gpg                                 \
+       selfsigs/alice-mallory-badsig18.pub                             \
+       selfsigs/alice-mallory-irrelevantsig.pub                        \
+       selfsigs/alice-mallory-nosig18.pub selfsigs/alice.pub
+
+dist_check_SCRIPTS = testselfsigs testcerts
 
+if ENABLE_OPENPGP
 # The selftest is disabled until we can make it work under Wine and
-# under Debian buildds (problem with 127.0.0.2?).  Just extra-dist it
-# for now.
-EXTRA_DIST += testcerts testselfsigs
-dist_check_SCRIPTS = testselfsigs #testcerts
+# under Debian buildds (problem with 127.0.0.2?).
 TESTS = testselfsigs #testcerts
-
 endif
+
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)

diff --git a/tests/openpgp-certs/testselfsigs b/tests/openpgp-certs/testselfsigs
index a1084fcae82d8606dc237bba49567f7ca08d1183..e6609dc1de5bb0f41a18213903c497b93f1076f7 100755 (executable)
--- a/tests/openpgp-certs/testselfsigs
+++ b/tests/openpgp-certs/testselfsigs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Copyright (C) 2010 Free Software Foundation, Inc.
 #
@@ -20,8 +20,11 @@
 # along with GNUTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+set -e
+
 srcdir="${srcdir:-.}"
-CERTTOOL="${certtool:-../../src/certtool} -q"
+CERTTOOL="${CERTTOOL:-../../src/certtool$EXEEXT}"
+
 unset RETCODE
 
 fail() {
@@ -31,14 +34,20 @@ fail() {
 
 echo "Checking OpenPGP certificate self verification"
 
-( $CERTTOOL --pgp-certificate-info <$srcdir/selfsigs/alice.pub | grep -e "^Self Signature verification: ok" ) >/dev/null ||
-  fail "Self sig Verification should have succeeded!"
+($CERTTOOL --pgp-certificate-info < $srcdir/selfsigs/alice.pub \
+    | grep "^Self Signature verification: ok" > /dev/null) || \
+    fail "Self sig Verification should have succeeded!"
+
+($CERTTOOL --pgp-certificate-info < $srcdir/selfsigs/alice-mallory-badsig18.pub \
+    | grep "^Self Signature verification: failed" > /dev/null) || \
+    fail "Self sig Verification should have failed!"
+
+($CERTTOOL --pgp-certificate-info < $srcdir/selfsigs/alice-mallory-irrelevantsig.pub \
+    | grep "^Self Signature verification: failed" >/dev/null) || \
+    fail "Self sig Verification should have failed!"
 
-( $CERTTOOL --pgp-certificate-info <$srcdir/selfsigs/alice-mallory-badsig18.pub | grep -e "^Self Signature verification: failed" ) >/dev/null ||
-  fail "Self sig Verification should have failed!"
-( $CERTTOOL --pgp-certificate-info <$srcdir/selfsigs/alice-mallory-irrelevantsig.pub | grep -e "^Self Signature verification: failed" ) >/dev/null ||
-  fail "Self sig Verification should have failed!"
-( $CERTTOOL --pgp-certificate-info <$srcdir/selfsigs/alice-mallory-nosig18.pub | grep -e "^Self Signature verification: failed" ) >/dev/null ||
-  fail "Self sig Verification should have failed!"
+($CERTTOOL --pgp-certificate-info < $srcdir/selfsigs/alice-mallory-nosig18.pub \
+    | grep "^Self Signature verification: failed" >/dev/null) || \
+    fail "Self sig Verification should have failed!"
 
 exit ${RETCODE:-0}