summaryrefslogtreecommitdiff
path: root/test/lisp/vc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-09-12 19:44:06 -0700
committerGlenn Morris <rgm@gnu.org>2020-09-12 19:47:29 -0700
commit5e7733694e9bbf77759267b6d0386383315d48b3 (patch)
tree2628e6cdadca36aeabc8062681870fc8920cae74 /test/lisp/vc
parent854855ec68c595edcce1b2dc768b20a65e41d0af (diff)
downloademacs-5e7733694e9bbf77759267b6d0386383315d48b3.tar.gz
Mark some diff tests as failing in nonascii directories
* test/lisp/vc/diff-mode-tests.el (diff-mode-test-font-lock) (diff-mode-test-font-lock-syntax-one-line): Expect failure in non-ascii directories. ; * lisp/vc/diff-mode.el (diff-hunk-file-names): Comment.
Diffstat (limited to 'test/lisp/vc')
-rw-r--r--test/lisp/vc/diff-mode-tests.el9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el
index e497ed204df..f17ec3648f1 100644
--- a/test/lisp/vc/diff-mode-tests.el
+++ b/test/lisp/vc/diff-mode-tests.el
@@ -206,6 +206,11 @@ youthfulness
(ert-deftest diff-mode-test-font-lock ()
"Check font-locking of diff hunks."
+ ;; See comments in diff-hunk-file-names about nonascii.
+ ;; In such cases, the diff-font-lock-syntax portion of this fails.
+ :expected-result (if (string-match-p "[[:nonascii:]]"
+ diff-mode-tests--datadir)
+ :failed :passed)
(skip-unless (executable-find shell-file-name))
(skip-unless (executable-find diff-command))
(let ((default-directory diff-mode-tests--datadir)
@@ -244,6 +249,7 @@ youthfulness
111 124 (face diff-context)
124 127 (face diff-context))))
+ ;; Test diff-font-lock-syntax.
(should (equal (mapcar (lambda (o)
(list (- (overlay-start o) diff-beg)
(- (overlay-end o) diff-beg)
@@ -267,6 +273,9 @@ youthfulness
(ert-deftest diff-mode-test-font-lock-syntax-one-line ()
"Check diff syntax highlighting for one line with no newline at end."
+ :expected-result (if (string-match-p "[[:nonascii:]]"
+ diff-mode-tests--datadir)
+ :failed :passed)
(skip-unless (executable-find shell-file-name))
(skip-unless (executable-find diff-command))
(let ((default-directory diff-mode-tests--datadir)