diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-09-20 17:18:16 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-09-20 17:18:16 -0700 |
| commit | 3675993d76cc6db43703240d0ff0fd892abf1b41 (patch) | |
| tree | 2615512bfb3d569b679efb09711dad1cea7536cc /test/lisp/vc | |
| parent | 15c594c282176cf8e29072de2934a046922053b1 (diff) | |
| parent | df04f3e755f3001ebb9cc428faa7fa46059e636b (diff) | |
| download | emacs-3675993d76cc6db43703240d0ff0fd892abf1b41.tar.gz | |
Merge from origin/emacs-27
df04f3e755 Fix a rare segfault in syntax.c
fd1fe1e1ec Add doc to syntax-propertize-function saying it must do a ...
fcd599bbea Minor copyedits of doc of 'with-silent-modifications'
759399cdb1 Improve documentation of 'max-mini-window-height'
3223302aa2 Use modern constant names for the NS pasteboard
985703d380 Fix doc string of 'toggle-menu-bar-mode-from-frame'
184a4977c7 Make vc-bzr tests work with brz 3.1 (bug#43314)
# Conflicts:
# lisp/emacs-lisp/syntax.el
# src/syntax.c
Diffstat (limited to 'test/lisp/vc')
| -rw-r--r-- | test/lisp/vc/vc-bzr-tests.el | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el index f738da7f41f..b68a6945129 100644 --- a/test/lisp/vc/vc-bzr-tests.el +++ b/test/lisp/vc/vc-bzr-tests.el @@ -38,13 +38,26 @@ ;; abort if they cannot. I could not figure out how to stop bzr ;; doing that, so just give it a temporary homedir for the duration. ;; http://bugs.launchpad.net/bzr/+bug/137407 ? + ;; + ;; Note that with bzr 2.x, this works: + ;; mkdir /tmp/bzr + ;; HOME=/nonexistent BZR_HOME=/tmp/bzr bzr status + ;; but with brz 3.1, it complains: + ;; "failed to open trace file: [Errno 13] Permission denied: '/nonexistent'" + ;; which confuses vc-dir. + ;; We can quieten brz by adding either BRZ_LOG=/dev/null, or + ;; XDG_CACHE_HOME=/tmp/bzr (log defaults to XDG_CACHE_HOME/breezy/brz.log), + ;; but it seems simpler to just set HOME to a newly created + ;; temporary directory. + ;; TODO does this means tests should be setting XDG_ variables (not + ;; just HOME) to temporary values too? (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-file-name "bzr" homedir)) (ignored-dir (progn (make-directory bzrdir) (expand-file-name "ignored-dir" bzrdir))) (default-directory (file-name-as-directory bzrdir)) - (process-environment (cons (format "BZR_HOME=%s" homedir) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -81,7 +94,7 @@ (expand-file-name "subdir" bzrdir))) (file (expand-file-name "file" bzrdir)) (default-directory (file-name-as-directory bzrdir)) - (process-environment (cons (format "BZR_HOME=%s" homedir) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -119,7 +132,7 @@ (expand-file-name "foo.el" bzrdir))) (default-directory (file-name-as-directory bzrdir)) (generated-autoload-file (expand-file-name "loaddefs.el" bzrdir)) - (process-environment (cons (format "BZR_HOME=%s" homedir) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn |