From f719a4086cabfadfd014e814e1cef6ae4dae94d1 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 2 Jun 2023 15:42:36 +0200
Subject: gnu: grep: Update hanging and failing tests on the Hurd.

* gnu/packages/base.scm (grep)[arguments]: When building natively on the Hurd,
remove Rename phase 'skip-triple-backref-test' to 'skip-tests'.  Remove
"tests/triple-backref" as it now passes.  Add the hanging
"tests/hash-collision-perf" test, and the failing "tests/file" test.
---
 gnu/packages/base.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/base.scm')

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e941853d20..f1b027b0dc 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -134,21 +134,17 @@ (define-public grep
                                  (string-append bin "/fgrep"))
                 (("^exec grep")
                  (string-append "exec " bin "/grep"))))))
-        ,@(if (target-hurd?)
-              '((add-before 'check 'skip-triple-backref-test
+        ,@(if (system-hurd?)
+              '((add-before 'check 'skip-test
                   (lambda _
-                    ;; This test is marked as malfunctioning on glibc systems
-                    ;; due to
-                    ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=11053>
-                    ;; and it triggers a segfault with glibc 2.33 on GNU/Hurd.
-                    ;; Skip it.
-                    (substitute* "tests/triple-backref"
-                      (("^warn_" all)
-                       (string-append "exit 77\n" all))))))
-              '()))
-      #:make-flags ,(if (target-hurd?)
-                        ''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX
-                        ''())))
+                    (substitute*
+                        ;; This test hangs
+                        '("tests/hash-collision-perf"
+                          ;; This test fails
+                          "tests/file")
+                      (("^#!.*" all)
+                       (string-append all "exit 77;\n"))))))
+              '()))))
    (synopsis "Print lines matching a pattern")
    (description
      "grep is a tool for finding text inside files.  Text is found by
-- 
cgit v1.2.3

d=aaf85222f108b868f095ef0e7400e219b945d032'>packages</a>/<a href='/guix/log/gnu/packages/ntp.scm?id=aaf85222f108b868f095ef0e7400e219b945d032'>ntp.scm</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/gnu/packages/ntp.scm?id=aaf85222f108b868f095ef0e7400e219b945d032&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-02-19 01:00:01 +0100'>2023-02-19</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=1e6ddceb8318d413745ca1c9d91fde01b1e0364b'>gnu: Use HTTPS package home pages wherever possible.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2022-09-18 16:18:35 +0200'>2022-09-18</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=2104efcddfd7649839673886ec44f77dcd5b5041'>gnu: Explicitly use OpenSSL 1.1 in packages that don't support 3.0.</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-09-11 19:43:15 +0200'>2022-09-11</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=150dda28f98a453204f321dc07355fe12aaceff9'>gnu: ntp: Adjust for glibc 2.34 and later.</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-09-04 02:00:01 +0200'>2022-09-04</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=3523e8e97539efe3e3fa2d06f970b763b8bde542'>gnu: chrony: Update to 4.3.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2022-04-18 22:57:18 +0200'>2022-04-18</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=902099a8c0fae2288d1da6d2da683b251b492691'>gnu: ntp: Support cross-compilation.</a></td><td>Petr Hodina</td></tr>
<tr><td><span title='2022-02-07 14:19:15 +0200'>2022-02-07</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=0073f442637e7f27006d747241f350e5d883aabe'>gnu: openntpd: Add release-monitoring-url.</a></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-12-16 16:27:03 +0100'>2021-12-16</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=b329c2139b9f0818f27107bec5226cb98cfe1446'>gnu: chrony: Update to 4.2.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/ntp.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a></td><td>Ludovic Courtès</td></tr>