summaryrefslogtreecommitdiff
path: root/t/test-lib.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-01-24 01:58:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-24 05:15:43 (GMT)
commit7599730b7e2be694142bfb2e95187afa78a5404a (patch)
treeb583ebde231174c01877e6eb1e2c7e41ce6f0780 /t/test-lib.sh
parent0205bb13d0f506136ef4134d1cbf69b3a8a1a2a0 (diff)
downloadgit-7599730b7e2be694142bfb2e95187afa78a5404a.zip
git-7599730b7e2be694142bfb2e95187afa78a5404a.tar.gz
git-7599730b7e2be694142bfb2e95187afa78a5404a.tar.bz2
Remove support for v1 of the PCRE library
Remove support for using version 1 of the PCRE library. Its use has been discouraged by upstream for a long time, and it's in a bugfix-only state. Anyone who was relying on v1 in particular got a nudge to move to v2 in e6c531b808 (Makefile: make USE_LIBPCRE=YesPlease mean v2, not v1, 2018-03-11), which was first released as part of v2.18.0. With this the LIBPCRE2 test prerequisites is redundant to PCRE. But I'm keeping it for self-documentation purposes, and to avoid conflict with other in-flight PCRE patches. I'm also not changing all of our own "pcre2" names to "pcre", i.e. the inverse of 6d4b5747f0 (grep: change internal *pcre* variable & function names to be *pcre1*, 2017-05-25). I don't see the point, and it makes the history/blame harder to read. Maybe if there's ever a PCRE v3... Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib.sh')
-rw-r--r--t/test-lib.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 03c1c08..2996d7c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1524,8 +1524,7 @@ esac
test -z "$NO_PERL" && test_set_prereq PERL
test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
test -z "$NO_PYTHON" && test_set_prereq PYTHON
-test -n "$USE_LIBPCRE1$USE_LIBPCRE2" && test_set_prereq PCRE
-test -n "$USE_LIBPCRE1" && test_set_prereq LIBPCRE1
+test -n "$USE_LIBPCRE2" && test_set_prereq PCRE
test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT