From f719a4086cabfadfd014e814e1cef6ae4dae94d1 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Fri, 2 Jun 2023 15:42:36 +0200 Subject: [PATCH] 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(-) 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 - ;; - ;; 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