diff options
| author | Eli Zaretskii | 2013-11-29 11:35:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-11-29 11:35:58 +0200 |
| commit | a48eb50b569677999fc2f8d6b59f0901f724ddb8 (patch) | |
| tree | e02973efeec27a05ea259b72734c40dc5f0e9040 | |
| parent | b7f79a5c4f0fc6d0ce4268249b4f247bd28c051f (diff) | |
| download | emacs-a48eb50b569677999fc2f8d6b59f0901f724ddb8.tar.gz emacs-a48eb50b569677999fc2f8d6b59f0901f724ddb8.zip | |
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.
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/automated/decoder-tests.el | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 25d17fc2af4..3ed077a6808 100644 --- a/test/ChangeLog +++ b/test/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-11-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * automated/decoder-tests.el (ert-test-decoder-prefer-utf-8): | ||
| 4 | Force Unix EOLs by using 'utf-8-unix', since the default of | ||
| 5 | 'utf-8' is system-dependent, while the test expects to see Unix | ||
| 6 | EOLs. | ||
| 7 | |||
| 1 | 2013-11-28 Glenn Morris <rgm@gnu.org> | 8 | 2013-11-28 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * automated/Makefile.in (SEPCHAR): Use in place of PATH_SEP. | 10 | * 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 @@ | |||
| 247 | 'unix)) | 247 | 'unix)) |
| 248 | (latin (decoder-tests-gen-file "utf-8.el" | 248 | (latin (decoder-tests-gen-file "utf-8.el" |
| 249 | (decoder-tests-file-contents 'latin) | 249 | (decoder-tests-file-contents 'latin) |
| 250 | 'utf-8))) | 250 | 'utf-8-unix))) |
| 251 | (should-not (decoder-tests-prefer-utf-8-read | 251 | (should-not (decoder-tests-prefer-utf-8-read |
| 252 | ascii 'prefer-utf-8-unix nil)) | 252 | ascii 'prefer-utf-8-unix nil)) |
| 253 | (should-not (decoder-tests-prefer-utf-8-read | 253 | (should-not (decoder-tests-prefer-utf-8-read |