[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 80d318a: Try to fix vc-test-git06-version-diff on Hydra
From: |
Dmitry Gutov |
Subject: |
master 80d318a: Try to fix vc-test-git06-version-diff on Hydra |
Date: |
Sun, 5 Sep 2021 19:33:10 -0400 (EDT) |
branch: master
commit 80d318aabbbf34761260104a0ddebde1ace559a6
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>
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 c20d1bd..4169a96 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))
))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 80d318a: Try to fix vc-test-git06-version-diff on Hydra,
Dmitry Gutov <=