diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-07 17:46:12 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-07 17:47:24 -0700 |
| commit | aedc566a94116191d3a8b3f7f9955058316f9fdc (patch) | |
| tree | 02c7082bfcfa23ce2b89393a382ba7112e47ba52 /test/src/fileio-tests.el | |
| parent | 53830c6336b52d58c315c7e11405181e01ee9a53 (diff) | |
| download | emacs-aedc566a94116191d3a8b3f7f9955058316f9fdc.tar.gz | |
Fix bug: (directory-file-name "///") returned "//"
* src/fileio.c (directory_file_name): For "///" and longer,
return "/", not "//", as per POSIX.
* test/src/fileio-tests.el (fileio-tests--directory-file-name)
(fileio-tests--file-name-as-directory): New tests.
Diffstat (limited to 'test/src/fileio-tests.el')
| -rw-r--r-- | test/src/fileio-tests.el | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el index 5103d2f21e6..ac5d533e63b 100644 --- a/test/src/fileio-tests.el +++ b/test/src/fileio-tests.el @@ -44,3 +44,22 @@ "Check that any non-NULL ASCII character can appear in a symlink. Also check that an encoding error can appear in a symlink." (should (equal nil (fileio-tests--symlink-failure)))) + +(ert-deftest fileio-tests--directory-file-name () + (should (equal (directory-file-name "/") "/")) + (should (equal (directory-file-name "//") "//")) + (should (equal (directory-file-name "///") "/")) + (should (equal (directory-file-name "////") "/")) + (should (equal (directory-file-name "/abc") "/abc")) + (should (equal (directory-file-name "/abc/") "/abc")) + (should (equal (directory-file-name "/abc//") "/abc"))) + +(ert-deftest fileio-tests--file-name-as-directory () + (should (equal (file-name-as-directory "") "./")) + (should (equal (file-name-as-directory "/") "/")) + (should (equal (file-name-as-directory "//") "//")) + (should (equal (file-name-as-directory "///") "///")) + (should (equal (file-name-as-directory "////") "////")) + (should (equal (file-name-as-directory "/abc") "/abc/")) + (should (equal (file-name-as-directory "/abc/") "/abc/")) + (should (equal (file-name-as-directory "/abc//") "/abc//"))) |