From 944e3502b133fc0e84e257c60ac36bdff9fcffd4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 10 Mar 2020 20:26:17 +0100
Subject: gnu: mercurial: Enable more tests.

* gnu/packages/version-control.scm (mercurial)[arguments]: Add phase
'patch-tests'.  Do not remove patched tests in the 'check' phase.
---
 gnu/packages/version-control.scm | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 5ea3dc415c..c289e43d94 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1332,27 +1332,39 @@ control to Git repositories.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-tests
+           (lambda _
+             (substitute* '("tests/test-extdiff.t"
+                            "tests/test-logtoprocess.t"
+                            "tests/test-patchbomb.t"
+                            "tests/test-run-tests.t"
+                            "tests/test-transplant.t")
+               (("/bin/sh")
+                (which "sh")))
+             #t))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (with-directory-excursion "tests"
                ;; The following tests are known to fail.
-               (for-each (lambda (file)
-                           (delete-file file))
-                         '("test-extdiff.t"
+               (for-each delete-file
+                         '(;; XXX: This test calls 'run-tests.py --with-hg=
+                           ;; `which hg`' and fails because there is no hg on
+                           ;; PATH from before (that's why we are building it!)?
                            "test-hghave.t"
+
+                           ;; FIXME: Why does this fail in the build container, but
+                           ;; not in 'guix environment -C' (even without /bin/sh)?
+                           "test-nointerrupt.t"
+
+                           ;; TODO: the fqaddr() call fails in the build
+                           ;; container, causing these server tests to fail.
                            "test-hgwebdir.t"
                            "test-http-branchmap.t"
-                           "test-logtoprocess.t"
-                           "test-merge-combination.t"
-                           "test-nointerrupt.t"
-                           "test-patchbomb.t"
                            "test-pull-bundle.t"
                            "test-push-http.t"
-                           "test-run-tests.t"
                            "test-serve.t"
                            "test-subrepo-deep-nested-change.t"
-                           "test-subrepo-recursion.t"
-                           "test-transplant.t"))
+                           "test-subrepo-recursion.t"))
                (when tests?
                  (invoke "./run-tests.py"
                          ;; ‘make check’ does not respect ‘-j’.
-- 
cgit 1.4.1