@matheusbsbs / matheus-bagliano / commits / ce9a257031

test-lib: add LIBPCRE1 & LIBPCRE2 prerequisites

Add LIBPCRE1 and LIBPCRE2 prerequisites which are true when git is compiled with USE_LIBPCRE1=YesPlease or USE_LIBPCRE2=YesPlease, respectively. The syntax of PCRE1 and PCRE2 isn't the same in all cases (see pcresyntax(3) and pcre2syntax(3)). If test are added that test for those they'll need to be guarded by these new prerequisites. The subsequent patch will make use of LIBPCRE2, so LIBPCRE1 isn't strictly needed for now, but let's add it for consistency and so that checking for it doesn't have to be done with the less obvious "PCRE, !LIBPCRE2", which while semantically the same is more confusing, and would lead to bugs if PCRE v3 is ever released as the tests would mean v1, not any non-v2 version. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Nov 23, 2017 at 14:16 UTC ce9a257031ca1cf3496c5bb1cd0d4b5ecb8379f2
2 files changed +14
t/README
+12
@@ -808,6 +808,18 @@ use these, and "test_set_prereq" for how to define your own.
808 Git was compiled with support for PCRE. Wrap any tests
809 that use git-grep --perl-regexp or git-grep -P in these.
810
811 + - LIBPCRE1
812 +
813 + Git was compiled with PCRE v1 support via
814 + USE_LIBPCRE1=YesPlease. Wrap any PCRE using tests that for some
815 + reason need v1 of the PCRE library instead of v2 in these.
816 +
817 + - LIBPCRE2
818 +
819 + Git was compiled with PCRE v2 support via
820 + USE_LIBPCRE2=YesPlease. Wrap any PCRE using tests that for some
821 + reason need v2 of the PCRE library instead of v1 in these.
822 +
823 - CASE_INSENSITIVE_FS
824
825 Test is run on a case insensitive file system.
t/test-lib.sh
+2
@@ -1028,6 +1028,8 @@ test -z "$NO_PERL" && test_set_prereq PERL
1028 test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
1029 test -z "$NO_PYTHON" && test_set_prereq PYTHON
1030 test -n "$USE_LIBPCRE1$USE_LIBPCRE2" && test_set_prereq PCRE
1031 +test -n "$USE_LIBPCRE1" && test_set_prereq LIBPCRE1
1032 +test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
1033 test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
1034
1035 # Can we rely on git's output in the C locale?