From 4f34b21800f08ccc44c87300a711089b5c201359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 28 May 2014 23:41:12 +0200
Subject: [PATCH] Fix for windows lineending in nettle-pbkdf2-test.
---
ChangeLog | 3 +++
testsuite/nettle-pbkdf2-test | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 674d2136..269a0cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-05-28 Niels Möller <nisse@lysator.liu.se>
+ * testsuite/nettle-pbkdf2-test: Delete carriage return characters
+ from output.
+
* configure.ac (LIBHOGWEED_LIBS): Be explicit and link
libhogweed.so with libnettle.so, not -lnettle.
(LIBHOGWEED_LINK): Drop -L. flag, no longer needed, and previously
diff --git a/testsuite/nettle-pbkdf2-test b/testsuite/nettle-pbkdf2-test
index e1241e16..fb18c42f 100755
--- a/testsuite/nettle-pbkdf2-test
+++ b/testsuite/nettle-pbkdf2-test
@@ -13,9 +13,11 @@ test_pbkdf2 () {
# $expected contains more than one space.
length=`expr "$expected" : '.*' / 2`
+ # Delete carriage return characters, needed when testing with
+ # wine.
printf "%s" "$password" | $EMULATOR ../tools/nettle-pbkdf2 \
- -i "$iters" -l "$length" "$salt" > test1.out
- echo "$expected" > test2.out
+ -i "$iters" -l "$length" "$salt" | tr -d '\r' > test1.out
+ echo "$expected" | tr -d '\r' > test2.out
if cmp test1.out test2.out ; then
true
--
GitLab