From 80d318aabbbf34761260104a0ddebde1ace559a6 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 6 Sep 2021 02:32:46 +0300 Subject: [PATCH] Try to fix vc-test-git06-version-diff on Hydra * test/lisp/vc/vc-tests.el (vc-test--version-diff): Fix Git backend when running in clean environment. (vc-test-git06-version-diff): Unskip on Hydra. --- test/lisp/vc/vc-tests.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el index c20d1bdf6a5..4169a96670a 100644 --- a/test/lisp/vc/vc-tests.el +++ b/test/lisp/vc/vc-tests.el @@ -615,10 +615,10 @@ This checks also `vc-backend' and `vc-responsible-backend'." (when (eq backend 'Bzr) (setq tempdir (make-temp-file "vc-test--version-diff" t) process-environment (cons (format "BZR_HOME=%s" tempdir) - (cons - "EMAIL=john@doe.ee" - process-environment)))) - + process-environment))) + (when (memq backend '(Bzr Git)) + (setq process-environment (cons "EMAIL=john@doe.ee" + process-environment))) (unwind-protect (progn ;; Cleanup. @@ -797,9 +797,6 @@ This checks also `vc-backend' and `vc-responsible-backend'." (ert-get-test ',(intern (format "vc-test-%s01-register" backend-string)))))) - ;; FIXME git (2.18.1) commit fails with status 128 - why? - (skip-unless (not (and (eq 'Git ',backend) - (getenv "EMACS_HYDRA_CI")))) (vc-test--version-diff ',backend)) )))) -- 2.39.2