From: Eli Zaretskii Date: Fri, 29 Nov 2013 09:35:58 +0000 (+0200) Subject: Fix decoder-tests test on MS-Windows. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~649 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a48eb50b569677999fc2f8d6b59f0901f724ddb8;p=emacs.git 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. --- 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