summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-12-19 15:06:18 -0500
committerGlenn Morris <rgm@gnu.org>2018-12-19 15:06:18 -0500
commitfda43a7bef499024fa5fcb32432e76c5839ee154 (patch)
tree932d00be836b8628c03c88bcc22e902440eb20f0
parent4370b8ebd9ecf934ae08c76d9e7161fcb5cf7c40 (diff)
downloademacs-fda43a7bef499024fa5fcb32432e76c5839ee154.tar.gz
Skip a vc-bzr test if run as root
* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-faulty-bzr-autoloads): Skip this test when run as root. This works around a race condition in root-specific code in vc-mode-line when deleting a file. ; Do not merge to master, instead fix vc-mode-line there.
-rw-r--r--test/lisp/vc/vc-bzr-tests.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index 6b96f3b928d..db64f61c43d 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -112,6 +112,9 @@
(ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
"Test we can generate autoloads in a bzr directory when bzr is faulty."
(skip-unless (executable-find vc-bzr-program))
+ ;; Avoid vc-mode-line bug;
+ ;; http://lists.gnu.org/r/emacs-devel/2018-12/msg00368.html
+ (skip-unless (not (eq 0 (user-real-uid))))
(let* ((homedir (make-temp-file "vc-bzr-test" t))
(bzrdir (expand-file-name "bzr" homedir))
(file (progn