From 3e34f89980416a3b2f8637b3f7d15e35ff56e92d Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 5 Oct 2020 23:52:24 -0400
Subject: gnu: lsh: Enable some tests.

* gnu/packages/ssh.scm (lsh)[native-inputs]: Add autoconf and automake.
[arguments]: Remove #:tests? argument.
[phases]{disable-failing-tests}: New phase.
---
 gnu/packages/ssh.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index e660c1cc5f..ca99235a01 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -598,7 +598,9 @@ basis for almost any application.")
               (patches (search-patches "lsh-fix-x11-forwarding.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("m4" ,m4)
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("m4" ,m4)
        ("guile" ,guile-2.0)
        ("gperf" ,gperf)
        ("psmisc" ,psmisc)))                       ; for `killall'
@@ -630,14 +632,20 @@ basis for almost any application.")
                            ;; 'lsh_argp.h' checks HAVE_ARGP_PARSE but nothing
                            ;; defines it.
                            "CPPFLAGS=-DHAVE_ARGP_PARSE")
-
-       ;; FIXME: Tests won't run in a chroot, presumably because
-       ;; /etc/profile is missing, and thus clients get an empty $PATH
-       ;; and nothing works.
-       #:tests? #f
-
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             ;; FIXME: Most tests won't run in a chroot, presumably because
+             ;; /etc/profile is missing, and thus clients get an empty $PATH
+             ;; and nothing works.  Run only the subset that passes.
+             (delete-file "configure")  ;force rebootstrap
+             (substitute* "src/testsuite/Makefile.am"
+               (("seed-test \\\\")        ;prevent trailing slash
+                "seed-test")
+               (("^\t(lsh|daemon|tcpip|socks|lshg|lcp|rapid7|lshd).*test.*")
+                ""))
+             #t))
          (add-before 'configure 'pre-configure
            (lambda* (#:key inputs #:allow-other-keys)
              (let* ((nettle    (assoc-ref inputs "nettle"))
-- 
cgit v1.2.3

/log/nix/libstore?id=acbd9f5e140291d7293e58dac7eff70543d084d5'>libstore</a>/<a href='/guix/log/nix/libstore/sqlite.hh?id=acbd9f5e140291d7293e58dac7eff70543d084d5'>sqlite.hh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/sqlite.hh?id=acbd9f5e140291d7293e58dac7eff70543d084d5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
0'>2019-05-20</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=996ecaf64e397341dbed70198032ce828040e5ac'>maint: update-NEWS: Track "gcc-toolchain", not "gcc".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-05 00:08:34 +0100'>2018-12-05</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=e3c03952be99419b958e98e5934fb3b86f71165d'>maint: update-NEWS: Don't produce full package lists.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-09-02 16:43:10 +0200'>2018-09-02</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=fe634eaf93ba40862acdf62d7f197c6f19f0651c'>Add (guix describe) and use it to initialize '%package-search-path'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>