diff options
| author | Michael Albinus <[email protected]> | 2014-06-02 11:53:43 +0200 |
|---|---|---|
| committer | Michael Albinus <[email protected]> | 2014-06-02 11:53:43 +0200 |
| commit | 84dbe84b9f87e49b2307e63859529f0a9f2ad5b9 (patch) | |
| tree | 7f679291c6a52633d129c610b91a4ea977c26668 /test | |
| parent | 9e158ac805afeab4346fbf34ddb642b4cfbb3c98 (diff) | |
* test/automated/tramp-tests.el (tramp-remote-process-environment): Declare.
(tramp-test29-vc-registered): Set $BZR_HOME.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/automated/tramp-tests.el | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 545e77adee..5c5017c882 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2014-06-02 Michael Albinus <[email protected]> + + * automated/tramp-tests.el (tramp-remote-process-environment): Declare. + (tramp-test29-vc-registered): Set $BZR_HOME. + 2014-06-01 Michael Albinus <[email protected]> * automated/tramp-tests.el (tramp-test29-vc-registered): diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 1ab3e1a652..349a6ad038 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -47,6 +47,7 @@ (declare-function tramp-find-executable "tramp-sh") (declare-function tramp-get-remote-path "tramp-sh") (defvar tramp-copy-size-limit) +(defvar tramp-remote-process-environment) ;; There is no default value on w32 systems, which could work out of the box. (defconst tramp-test-temporary-file-directory @@ -1398,10 +1399,19 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (let* ((default-directory tramp-test-temporary-file-directory) (tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (expand-file-name "foo" tmp-name1)) + (tramp-remote-process-environment tramp-remote-process-environment) (vc-handled-backends (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil (cond ((tramp-find-executable v vc-bzr-program (tramp-get-remote-path v)) + (setq tramp-remote-process-environment + (cons (format "BZR_HOME=%s" + (file-remote-p tmp-name1 'localname)) + tramp-remote-process-environment)) + ;; We must force a reconnect, in order to activate $BZR_HOME. + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) '(Bzr)) ((tramp-find-executable v vc-git-program (tramp-get-remote-path v)) '(Git)) |