diff -r 6a13fe0fc19e -r 1016349e619f test/harness/testcaseinput.c
--- a/test/harness/testcaseinput.c	Mon Jan 30 00:36:31 2012 +0000
+++ b/test/harness/testcaseinput.c	Tue May 28 15:17:19 2013 +0100
@@ -32,12 +32,14 @@
 }
 
 /*
- * Replace \n with \r\n and U+240A (visible symbol for LF) with \n
+ * Replace \n with \r\n, U+240A (visible symbol for LF) with \n
+ * and U+240D (visible symbol for CR) with \r.
  */
 static char *unix2dos(const char *text)
 {
     gunichar c;
     const gunichar visible_lf=0x240A;
+    const gunichar visible_cr=0x240D;
     GString *string;
     string=g_string_new(NULL);
     while(*text)
@@ -48,6 +50,8 @@
 	    g_string_append(string,"\r\n");
 	else if (c==visible_lf)
 	    g_string_append_c(string,'\n');
+	else if (c==visible_cr)
+	    g_string_append_c(string,'\r');
 	else
 	    g_string_append_unichar(string,c);
     }