[Emacs-diffs] trunk r117228: * test/automated/tramp-tests.el (tramp-remote-process-environment): Declare.

[Michael Albinus]

------------------------------------------------------------
revno: 117228
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-02 11:53:43 +0200
message:
  * test/automated/tramp-tests.el (tramp-remote-process-environment): Declare.
  (tramp-test29-vc-registered): Set $BZR_HOME.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/tramp-tests.el  tramptests.el-20131105142319-d9zp3oprkpxj5v1e-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-06-02 00:18:22 +0000
+++ b/test/ChangeLog    2014-06-02 09:53:43 +0000
@@ -1,3 +1,8 @@
+2014-06-02  Michael Albinus  <address@hidden>
+
+       * automated/tramp-tests.el (tramp-remote-process-environment): Declare.
+       (tramp-test29-vc-registered): Set $BZR_HOME.
+
 2014-06-01  Michael Albinus  <address@hidden>
 
        * automated/tramp-tests.el (tramp-test29-vc-registered):

=== modified file 'test/automated/tramp-tests.el'
--- a/test/automated/tramp-tests.el     2014-06-02 00:18:22 +0000
+++ b/test/automated/tramp-tests.el     2014-06-02 09:53:43 +0000
@@ -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 @@
   (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))