bug#28966: git fails test suite

[Marius Bakke]

Ricardo Wurmus <address@hidden> writes:

> As of 62d48234e20c732ebefc1b4deb425f590b4241ca git fails at least one of
> its tests on my servers:
>
> --8<---------------cut here---------------start------------->8---
> not ok 185 - --contains and --no-contains work in a deep repo
> #
> #               >expect &&
> #               i=1 &&
> #               while test $i -lt 8000
> #               do
> #                       echo "commit refs/heads/master
> #       committer A U Thor <address@hidden> $((1000000000 + $i * 100)) +0200
> #       data <<EOF
> #       commit #$i
> #       EOF"
> #                       test $i = 1 && echo "from refs/heads/master^0"
> #                       i=$(($i + 1))
> #               done | git fast-import &&
> #               git checkout master &&
> #               git tag far-far-away HEAD^ &&
> #               run_with_limited_stack git tag --contains HEAD >actual &&
> #               test_cmp expect actual &&
> #               run_with_limited_stack git tag --no-contains HEAD >actual &&
> #               test_line_count "-gt" 10 actual
> #
> --8<---------------cut here---------------end--------------->8---
>
> The server has 1.5TB RAM and 192 cores.  I’ve tried to build git about 5
> times; some of these times I used “--cores=1” to force a sequential
> build, but the tests would still fail.

I wonder if this has anything to do with the fact that this test (and
one other) limits the stack size to 128 kB (ulimit -s).  FWIW here is
the commit that added this test:

https://github.com/git/git/commit/cbc60b67201e083a4970c8731c5382a575357e36

It has since been increased from 64kB to 128kB, so I wonder if the
attached patch will make any difference.  Can you try it?

From f95ae3d32e5eab9797cb1591cca07c4d31f187ab Mon Sep 17 00:00:00 2001
From: Marius Bakke <address@hidden>
Date: Wed, 1 Nov 2017 21:11:29 +0100
Subject: [PATCH] gnu: git: Increase stack size for tests.

* gnu/packages/version-control.scm (git)[arguments]: Add substitution in
'patch-tests' phase.
---
 gnu/packages/version-control.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index af880c29f..9059284ed 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -216,6 +216,12 @@ as well as the classic centralized workflow.")
             ;; Many tests contain inline shell scripts (hooks etc).
             (substitute* (find-files "t" "\\.sh$")
               (("#!/bin/sh") (string-append "#!" (which "sh"))))
+            ;; XXX: Some tests run with a limited stack size, but it may
+            ;; be too small for very large machines (1TB+).  See
+            ;; <https://bugs.gnu.org/28966>.
+            (substitute* "t/test-lib.sh"
+              (("\\(ulimit -s 128")
+               "(ulimit -s 256"))
             ;; Un-do shebang patching here to prevent checksum mismatch.
             (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post")
               (("^#!.*/bin/perl") "#!/usr/bin/perl"))
-- 
2.14.3

signature.asc
Description: PGP signature