summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-10-31 14:59:26 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-10-31 14:59:26 +0100
commitcee8b28221b35027a000a5e0a08599308a4d19b9 (patch)
treeb645ed0d7f9b9c8a8d1e06da41b8d423e7fb42e2 /tests
parent356c0de9add6b3f41c8d186aa4ff2b6cd83ee6e2 (diff)
downloadgnutls-cee8b28221b35027a000a5e0a08599308a4d19b9.tar.gz
win32 fix
Diffstat (limited to 'tests')
-rwxr-xr-xtests/cert-tests/pem-decoding6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
index 219d029910..ce13145634 100755
--- a/tests/cert-tests/pem-decoding
+++ b/tests/cert-tests/pem-decoding
@@ -45,7 +45,9 @@ if test "$rc" != "0"; then
exit $rc
fi
-$DIFF $srcdir/bmpstring.pem tmp-pem.pem
+#Note that --strip-trailing-cr is used for the test
+#to run on windows platform.
+$DIFF $srcdir/bmpstring.pem tmp-pem.pem || $DIFF --strip-trailing-cr $srcdir/bmpstring.pem tmp-pem.pem
rc=$?
if test "$rc" != "0"; then
@@ -64,7 +66,7 @@ fi
cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
cat tmp-pem.pem |grep -v "Not After:" >tmp2
-$DIFF tmp1 tmp2
+$DIFF tmp1 tmp2 || $DIFF --strip-trailing-cr tmp1 tmp2
rc=$?
if test "$rc" != "0"; then