diff options
| -rw-r--r-- | test/automated/vc-bzr.el | 15 |
1 files 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 @@ | |||
| 33 | (skip-unless (executable-find vc-bzr-program)) | 33 | (skip-unless (executable-find vc-bzr-program)) |
| 34 | ;; Bzr wants to access HOME, e.g. to write ~/.bzr.log. | 34 | ;; Bzr wants to access HOME, e.g. to write ~/.bzr.log. |
| 35 | ;; This is a problem on hydra, where HOME is non-existent. | 35 | ;; This is a problem on hydra, where HOME is non-existent. |
| 36 | ;; You can disable logging with BZR_LOG=/dev/null, but then | 36 | ;; You can disable logging with BZR_LOG=/dev/null, but then some |
| 37 | ;; some commands (eg `bzr status') want to access ~/.bazaar, | 37 | ;; commands (eg `bzr status') want to access ~/.bazaar, and will |
| 38 | ;; and will abort if they cannot. I could not figure out how to | 38 | ;; abort if they cannot. I could not figure out how to stop bzr |
| 39 | ;; stop bzr doing that, so just set HOME to a tempdir for the duration. | 39 | ;; doing that, so just give it a temporary homedir for the duration. |
| 40 | ;; http://bugs.launchpad.net/bzr/+bug/137407 ? | ||
| 40 | (let* ((homedir (make-temp-file "vc-bzr-test" t)) | 41 | (let* ((homedir (make-temp-file "vc-bzr-test" t)) |
| 41 | (bzrdir (expand-file-name "bzr" homedir)) | 42 | (bzrdir (expand-file-name "bzr" homedir)) |
| 42 | (ignored-dir (progn | 43 | (ignored-dir (progn |
| 43 | (make-directory bzrdir) | 44 | (make-directory bzrdir) |
| 44 | (expand-file-name "ignored-dir" bzrdir))) | 45 | (expand-file-name "ignored-dir" bzrdir))) |
| 45 | (default-directory (file-name-as-directory bzrdir)) | 46 | (default-directory (file-name-as-directory bzrdir)) |
| 46 | (process-environment (cons (format "HOME=%s" homedir) | 47 | (process-environment (cons (format "BZR_HOME=%s" homedir) |
| 47 | process-environment))) | 48 | process-environment))) |
| 48 | (unwind-protect | 49 | (unwind-protect |
| 49 | (progn | 50 | (progn |
| @@ -79,7 +80,7 @@ | |||
| 79 | (expand-file-name "subdir" bzrdir))) | 80 | (expand-file-name "subdir" bzrdir))) |
| 80 | (file (expand-file-name "file" bzrdir)) | 81 | (file (expand-file-name "file" bzrdir)) |
| 81 | (default-directory (file-name-as-directory bzrdir)) | 82 | (default-directory (file-name-as-directory bzrdir)) |
| 82 | (process-environment (cons (format "HOME=%s" homedir) | 83 | (process-environment (cons (format "BZR_HOME=%s" homedir) |
| 83 | process-environment))) | 84 | process-environment))) |
| 84 | (unwind-protect | 85 | (unwind-protect |
| 85 | (progn | 86 | (progn |
| @@ -120,7 +121,7 @@ | |||
| 120 | (expand-file-name "foo.el" bzrdir))) | 121 | (expand-file-name "foo.el" bzrdir))) |
| 121 | (default-directory (file-name-as-directory bzrdir)) | 122 | (default-directory (file-name-as-directory bzrdir)) |
| 122 | (generated-autoload-file (expand-file-name "loaddefs.el" bzrdir)) | 123 | (generated-autoload-file (expand-file-name "loaddefs.el" bzrdir)) |
| 123 | (process-environment (cons (format "HOME=%s" homedir) | 124 | (process-environment (cons (format "BZR_HOME=%s" homedir) |
| 124 | process-environment))) | 125 | process-environment))) |
| 125 | (unwind-protect | 126 | (unwind-protect |
| 126 | (progn | 127 | (progn |