diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-11 01:48:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-11 01:48:33 +0300 |
| commit | 0199c68d010b613bde2575cd54d8c3597431fc81 (patch) | |
| tree | bface5b67ae70075c2e303bd947b54dbbb5f2aad /t | |
| parent | 938ecaa42f1be47b9bcaa947ecd6b04f9c1dc3db (diff) | |
| parent | 7599730b7e2be694142bfb2e95187afa78a5404a (diff) | |
Merge branch 'ab/retire-pcre1'
The support for deprecated PCRE1 library has been dropped.
* ab/retire-pcre1:
Remove support for v1 of the PCRE library
config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
Diffstat (limited to 't')
| -rw-r--r-- | t/README | 12 | ||||
| -rw-r--r-- | t/test-lib.sh | 3 |
2 files changed, 1 insertions, 14 deletions
@@ -1104,18 +1104,6 @@ use these, and "test_set_prereq" for how to define your own. Git was compiled with support for PCRE. Wrap any tests that use git-grep --perl-regexp or git-grep -P in these. - - LIBPCRE1 - - Git was compiled with PCRE v1 support via - USE_LIBPCRE1=YesPlease. Wrap any PCRE using tests that for some - reason need v1 of the PCRE library instead of v2 in these. - - - LIBPCRE2 - - Git was compiled with PCRE v2 support via - USE_LIBPCRE2=YesPlease. Wrap any PCRE using tests that for some - reason need v2 of the PCRE library instead of v1 in these. - - CASE_INSENSITIVE_FS Test is run on a case insensitive file system. diff --git a/t/test-lib.sh b/t/test-lib.sh index 76062db296..4bfa7f74ae 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 |