From a48eb50b569677999fc2f8d6b59f0901f724ddb8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 29 Nov 2013 11:35:58 +0200 Subject: [PATCH] Fix decoder-tests test on MS-Windows. test/automated/decoder-tests.el (ert-test-decoder-prefer-utf-8): Force Unix EOLs by using 'utf-8-unix', since the default of 'utf-8' is system-dependent, while the test expects to see Unix EOLs. --- test/ChangeLog | 7 +++++++ test/automated/decoder-tests.el | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/ChangeLog b/test/ChangeLog index 25d17fc2af4..3ed077a6808 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2013-11-29 Eli Zaretskii + + * automated/decoder-tests.el (ert-test-decoder-prefer-utf-8): + Force Unix EOLs by using 'utf-8-unix', since the default of + 'utf-8' is system-dependent, while the test expects to see Unix + EOLs. + 2013-11-28 Glenn Morris * automated/Makefile.in (SEPCHAR): Use in place of PATH_SEP. diff --git a/test/automated/decoder-tests.el b/test/automated/decoder-tests.el index 2e99fd7f115..1326e95e3d6 100644 --- a/test/automated/decoder-tests.el +++ b/test/automated/decoder-tests.el @@ -247,7 +247,7 @@ 'unix)) (latin (decoder-tests-gen-file "utf-8.el" (decoder-tests-file-contents 'latin) - 'utf-8))) + 'utf-8-unix))) (should-not (decoder-tests-prefer-utf-8-read ascii 'prefer-utf-8-unix nil)) (should-not (decoder-tests-prefer-utf-8-read -- 2.39.2