2 files changed, 14 insertions, 3 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 0a3e89e7385..d19a04ed77d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-08  Glenn Morris  <rgm@gnu.org>
+
+        * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
+        (vc-bzr-test-faulty-bzr-autoloads): Disable bzr logging.
+
 2014-05-05  Dmitry Gutov  <dgutov@yandex.ru>
 
         * automated/ruby-mode-tests.el
diff --git a/test/automated/vc-bzr.el b/test/automated/vc-bzr.el
index e2ea3f6aeea..5cfa3c2691f 100644
--- a/test/automated/vc-bzr.el
+++ b/test/automated/vc-bzr.el
@@ -33,7 +33,9 @@
   (skip-unless (executable-find vc-bzr-program))
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (ignored-dir (expand-file-name "ignored-dir" tempdir))
-         (default-directory (file-name-as-directory tempdir)))
+         (default-directory (file-name-as-directory tempdir))
+         (process-environment (cons (format "BZR_LOG=%s" null-device)
+                                    process-environment)))
     (unwind-protect
         (progn
           (make-directory ignored-dir)
@@ -64,7 +66,9 @@
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (subdir (expand-file-name "subdir" tempdir))
          (file (expand-file-name "file" tempdir))
-         (default-directory (file-name-as-directory tempdir)))
+         (default-directory (file-name-as-directory tempdir))
+         (process-environment (cons (format "BZR_LOG=%s" null-device)
+                                    process-environment)))
     (unwind-protect
         (progn
           (call-process vc-bzr-program nil nil nil "init")
@@ -100,7 +104,9 @@
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (file (expand-file-name "foo.el" tempdir))
          (default-directory (file-name-as-directory tempdir))
-         (generated-autoload-file (expand-file-name "loaddefs.el" tempdir)))
+         (generated-autoload-file (expand-file-name "loaddefs.el" tempdir))
+         (process-environment (cons (format "BZR_LOG=%s" null-device)
+                                    process-environment)))
     (unwind-protect
         (progn
           (call-process vc-bzr-program nil nil nil "init")