core/pkgs/by-name/pa/patchutils/Revert-Fix-grepdiff-test.patch

39 lines
1.1 KiB
Diff
Raw Normal View History

2024-05-02 00:46:19 +00:00
From 13672e53371ea9593130bdca178f3b8b2e174032 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 25 Apr 2024 09:10:54 +0200
Subject: [PATCH] Revert "Fix grepdiff test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit a6538753a51db973a05c9034ed78f2dd946453db.
There's no need for an escape here, because POSIX regexes don't treat
'+' specially if it's at the start of the experssion. musl rejects
the version with the backslash.
I'm still not clear why this change was made in the first place, but
reverting it seems to make the test pass on both glibc and musl…
Link: https://github.com/twaugh/patchutils/issues/61
---
tests/grepdiff1/run-test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/grepdiff1/run-test b/tests/grepdiff1/run-test
index c4311f8..c3cebdd 100755
--- a/tests/grepdiff1/run-test
+++ b/tests/grepdiff1/run-test
@@ -20,7 +20,7 @@ cat << EOF > diff
+b
EOF
-${GREPDIFF} '\+a' diff 2>errors >index || exit 1
+${GREPDIFF} '+a' diff 2>errors >index || exit 1
[ -s errors ] && exit 1
cat << EOF | cmp - index || exit 1
--
2.44.0