Fix for windows lineending in nettle-pbkdf2-test.

ChangeLog

 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

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