diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-11-26 09:32:25 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-11-28 10:13:47 +0100 |
| commit | a83f6f1ec72d58bba1730b3c8292e45f773f2b96 (patch) | |
| tree | 2148c2b59d59795105db7f40c76d836974c2a758 /tests/cert-tests | |
| parent | 7a29bb87d76f83639972b51c1b206cb9e7d28f4f (diff) | |
| download | gnutls-a83f6f1ec72d58bba1730b3c8292e45f773f2b96.tar.gz | |
tests: updates for certtool test to run under windows
Diffstat (limited to 'tests/cert-tests')
| -rw-r--r-- | tests/cert-tests/Makefile.am | 3 | ||||
| -rwxr-xr-x | tests/cert-tests/certtool | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index cf13820512..42c340dc4b 100644 --- a/tests/cert-tests/Makefile.am +++ b/tests/cert-tests/Makefile.am @@ -64,3 +64,6 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ top_builddir="$(top_builddir)" \ srcdir="$(srcdir)" +if WINDOWS +TESTS_ENVIRONMENT += WINDOWS=1 +endif diff --git a/tests/cert-tests/certtool b/tests/cert-tests/certtool index 46309b3aed..c814de7002 100755 --- a/tests/cert-tests/certtool +++ b/tests/cert-tests/certtool @@ -52,7 +52,7 @@ if test "${id}" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3"; then exit 1 fi -id=`"${CERTTOOL}" --pubkey-info <"${srcdir}/funny-spacing.pem"|"${CERTTOOL}" --key-id --hash sha256` +id=`"${CERTTOOL}" --pubkey-info <"${srcdir}/funny-spacing.pem"|"${CERTTOOL}" --key-id --hash sha256| tr -d '\r'` rc=$? if test "${id}" != "118e72e3655150c895ecbd19b3634179fb4a87c7a25abefcb11f5d66661d5a4d"; then @@ -81,7 +81,7 @@ export TZ="UTC" # Check for datefudge TSTAMP=`datefudge "2006-09-23" date -u +%s || true` -if test "$TSTAMP" != "1158969600"; then +if test "$TSTAMP" != "1158969600" || test "$WINDOWS" = 1; then echo $TSTAMP echo "You need datefudge to run this test" exit 77 |