mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-29 07:42:23 -05:00
a34348967e
* 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.
27 lines
1 KiB
Diff
27 lines
1 KiB
Diff
Suppress a warning from grep which causes tests to fail.
|
|
|
|
Taken from upstream pull request:
|
|
|
|
https://github.com/aureliojargas/clitest/pull/54
|
|
|
|
diff --git a/test/inline-match-egrep.sh b/test/inline-match-egrep.sh
|
|
--- a/test/inline-match-egrep.sh
|
|
+++ b/test/inline-match-egrep.sh
|
|
@@ -42,7 +42,7 @@ $ printf ' \t \t\t \n' #=> --egrep ^ $
|
|
# egrep regexes. You'll need to test in your system if that's the
|
|
# case. I recommend using a literal tab to avoid problems.
|
|
|
|
-$ printf 'may\tfail' #=> --egrep ^may\tfail$
|
|
+$ printf 'may\tfail' #=> --egrep ^may\\tfail$
|
|
$ printf 'may\tfail' #=> --egrep ^may[\t]fail$
|
|
$ printf 'will\tmatch' #=> --egrep ^will match$
|
|
|
|
@@ -51,7 +51,7 @@ $ printf 'will\tmatch' #=> --egrep ^will match$
|
|
# These tests will fail:
|
|
|
|
$ printf 'will\nfail' #=> --egrep will.*fail
|
|
-$ printf 'will\nfail' #=> --egrep will\nfail
|
|
+$ printf 'will\nfail' #=> --egrep will\\nfail
|
|
|
|
# If one line of a multiline results matches, the test is OK
|
|
|