aboutsummaryrefslogtreecommitdiffstats
path: root/test/src
diff options
context:
space:
mode:
authorGlenn Morris2017-12-20 14:28:04 -0500
committerGlenn Morris2017-12-20 14:28:04 -0500
commit964dd38c8f71d13ab33ef1ba1f1e63c166c13fb6 (patch)
tree8f6fbc43e57b8666670377b9eb11f1103ace2c13 /test/src
parent4122d54067c61bbdff5aab7ddf5dfe5b5797b218 (diff)
downloademacs-964dd38c8f71d13ab33ef1ba1f1e63c166c13fb6.tar.gz
emacs-964dd38c8f71d13ab33ef1ba1f1e63c166c13fb6.zip
Unbreak a fileio test on non-Mac OS X systems
* test/src/fileio-tests.el (fileio-tests--symlink-failure): Don't use an undefined coding system. ; No need to merge to master, since breaking commit wasn't merged.
Diffstat (limited to 'test/src')
-rw-r--r--test/src/fileio-tests.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index 6962b684565..5ed67919a5a 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -30,7 +30,10 @@
30(defun fileio-tests--symlink-failure () 30(defun fileio-tests--symlink-failure ()
31 (let* ((dir (make-temp-file "fileio" t)) 31 (let* ((dir (make-temp-file "fileio" t))
32 (link (expand-file-name "link" dir)) 32 (link (expand-file-name "link" dir))
33 (file-name-coding-system 'utf-8-hfs-unix)) 33 (file-name-coding-system (if (and (eq system-type 'darwin)
34 (featurep 'ucs-normalize))
35 'utf-8-hfs-unix
36 file-name-coding-system)))
34 (unwind-protect 37 (unwind-protect
35 (let (failure 38 (let (failure
36 (char 0)) 39 (char 0))