From de20f087b85e60b0d5aa899141a3349d4d9da80d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 29 Nov 2013 12:33:31 +0200 Subject: [PATCH] Fix reftex-tests on MS-Windows. test/automated/reftex-tests.el (reftex-parse-from-file-test): Run temp-dir through file-truename, to make sure the temporary file names are comparable as strings. --- test/ChangeLog | 4 ++++ test/automated/reftex-tests.el | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/test/ChangeLog b/test/ChangeLog index 3ed077a6808..e16e0b21281 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,9 @@ 2013-11-29 Eli Zaretskii + * automated/reftex-tests.el (reftex-parse-from-file-test): Run + temp-dir through file-truename, to make sure the temporary file + names are comparable as strings. + * 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 diff --git a/test/automated/reftex-tests.el b/test/automated/reftex-tests.el index de7f36d825a..74a9f3d806c 100644 --- a/test/automated/reftex-tests.el +++ b/test/automated/reftex-tests.el @@ -95,7 +95,14 @@ (ert-deftest reftex-parse-from-file-test () "Test `reftex-parse-from-file'." - (let* ((temp-dir (make-temp-file "reftex-parse" 'dir)) + ;; Use file-truename to convert 8+3 aliases in $TEMP value on + ;; MS-Windows into their long file-name equivalents, which is + ;; necessary for the 'equal' and 'string=' comparisons below. This + ;; also resolves any symlinks, which cannot be bad for the same + ;; reason. (An alternatrive solution would be to use file-equal-p, + ;; but I'm too lazy to do that, as one of the tests compares a + ;; list.) + (let* ((temp-dir (file-truename (make-temp-file "reftex-parse" 'dir))) (tex-file (expand-file-name "test.tex" temp-dir)) (bib-file (expand-file-name "ref.bib" temp-dir))) (with-temp-buffer -- 2.39.2