From 833737d71e211570ff496cfb3e8b33170c59e8a5 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 8 May 2014 00:23:40 -0700 Subject: [PATCH] * test/automated/vc-bzr.el: Tweak previous to use BZR_HOME rather than HOME --- test/automated/vc-bzr.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/automated/vc-bzr.el b/test/automated/vc-bzr.el index aae4ed26466..4c16465d54b 100644 --- a/test/automated/vc-bzr.el +++ b/test/automated/vc-bzr.el @@ -33,17 +33,18 @@ (skip-unless (executable-find vc-bzr-program)) ;; Bzr wants to access HOME, e.g. to write ~/.bzr.log. ;; This is a problem on hydra, where HOME is non-existent. - ;; You can disable logging with BZR_LOG=/dev/null, but then - ;; some commands (eg `bzr status') want to access ~/.bazaar, - ;; and will abort if they cannot. I could not figure out how to - ;; stop bzr doing that, so just set HOME to a tempdir for the duration. + ;; You can disable logging with BZR_LOG=/dev/null, but then some + ;; commands (eg `bzr status') want to access ~/.bazaar, and will + ;; 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 ? (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 "HOME=%s" homedir) + (process-environment (cons (format "BZR_HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -79,7 +80,7 @@ (expand-file-name "subdir" bzrdir))) (file (expand-file-name "file" bzrdir)) (default-directory (file-name-as-directory bzrdir)) - (process-environment (cons (format "HOME=%s" homedir) + (process-environment (cons (format "BZR_HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -120,7 +121,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 "HOME=%s" homedir) + (process-environment (cons (format "BZR_HOME=%s" homedir) process-environment))) (unwind-protect (progn