diff -r 51a0beae92f6 -r cd3068704d3a test/harness/testcaseinput.c --- a/test/harness/testcaseinput.c Mon Feb 20 08:13:47 2012 +0000 +++ b/test/harness/testcaseinput.c Sun Oct 20 21:06:25 2013 +0100 @@ -76,9 +76,15 @@ { if (testcase->encoding) { - t=unix2dos(input->contents); - s=g_convert(t,-1,testcase->encoding,"UTF-8",NULL,&n,&tmp_err); - g_free(t); + if (testcase->flags&TESTCASE_UNIX_NEWLINES) + s=g_convert(input->contents,-1,testcase->encoding,"UTF-8",NULL, + &n,&tmp_err); + else + { + t=unix2dos(input->contents); + s=g_convert(t,-1,testcase->encoding,"UTF-8",NULL,&n,&tmp_err); + g_free(t); + } if (!s) { g_propagate_prefixed_error(error,tmp_err, @@ -86,6 +92,11 @@ return FALSE; } } + else if (testcase->flags&TESTCASE_UNIX_NEWLINES) + { + s=g_strdup(input->contents); + n=strlen(s); + } else { s=unix2dos(input->contents);