From a34348967e032acfab2aa0b512d318a70f5543dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Apr 2023 23:16:54 +0800 Subject: gnu: clitest: Fix test failure with newer grep. * gnu/packages/patches/clitest-grep-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/check.scm (clitest)[source](patches): New field. [arguments]: While at it, remove obsolete substitution. --- gnu/packages/check.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e671972654..17c2b7284e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -310,6 +310,7 @@ (define-public clitest (method git-fetch) (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) + (patches (search-patches "clitest-grep-compat.patch")) (sha256 (base32 "1p745mxiq3hgi3ywfljs5sa1psi06awwjxzw0j9c2xx1b09yqv4a")))) @@ -325,13 +326,6 @@ (define-public clitest (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (substitute* "test.md" - ;; One test looks for an error from grep in the form "grep: foo", - ;; but our grep returns the absolute file name on errors. Adjust - ;; the test to cope with that. - (("sed 's/\\^e\\*grep: \\.\\*/") - "sed 's/.*e*grep: .*/")) - (setenv "HOME" "/tmp") (invoke "./clitest" "test.md")))) (replace 'install -- cgit v1.2.3