walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Patches to fix tests under Windows.

This commit is contained in:
Philip.Hazel 2016-01-29 15:01:17 +00:00
parent bebd2d48bf
commit fd008957d5
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,6 +1,14 @@
Change Log for PCRE2 Change Log for PCRE2
-------------------- --------------------
Version 10.22 29-January-2016
-----------------------------
1. Applied Jason Hood's patches to RunTest.bat and testdata/wintestoutput3
to fix problems with running the tests under Windows.
Version 10.21 12-January-2016 Version 10.21 12-January-2016
----------------------------- -----------------------------

14
RunTest.bat
View File

@ -242,11 +242,18 @@ if [%3] == [] (
exit /b 1 exit /b 1
) )
if %1 == 8 (
set outnum=8-%bits%-%link_size%
) else if %1 == 22 (
set outnum=22-%bits%
) else (
set outnum=%1
)
set testinput=testinput%1 set testinput=testinput%1
set testoutput=testoutput%1 set testoutput=testoutput%outnum%
if exist %srcdir%\testdata\win%testinput% ( if exist %srcdir%\testdata\win%testinput% (
set testinput=wintestinput%1 set testinput=wintestinput%1
set testoutput=wintestoutput%1 set testoutput=wintestoutput%outnum%
) )
echo Test %1: %3 echo Test %1: %3
@ -259,9 +266,6 @@ if errorlevel 1 (
) )
set type= set type=
if [%1]==[8] (
set type=-%bits%
)
if [%1]==[11] ( if [%1]==[11] (
set type=-%bits% set type=-%bits%
) )

6
configure.ac
View File

@ -9,9 +9,9 @@ dnl The PCRE2_PRERELEASE feature is for identifying release candidates. It might
dnl be defined as -RC2, for example. For real releases, it should be empty. dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre2_major, [10]) m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [21]) m4_define(pcre2_minor, [22])
m4_define(pcre2_prerelease, []) m4_define(pcre2_prerelease, [-RC1])
m4_define(pcre2_date, [2016-01-12]) m4_define(pcre2_date, [2016-01-29])
# NOTE: The CMakeLists.txt file searches for the above variables in the first # NOTE: The CMakeLists.txt file searches for the above variables in the first
# 50 lines of this file. Please update that if the variables above are moved. # 50 lines of this file. Please update that if the variables above are moved.

6
src/pcre2.h
View File

@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
/* The current PCRE version information. */ /* The current PCRE version information. */
#define PCRE2_MAJOR 10 #define PCRE2_MAJOR 10
#define PCRE2_MINOR 21 #define PCRE2_MINOR 22
#define PCRE2_PRERELEASE #define PCRE2_PRERELEASE -RC1
#define PCRE2_DATE 2016-01-12 #define PCRE2_DATE 2016-01-29
/* When an application links to a PCRE DLL in Windows, the symbols that are /* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE2, the appropriate imported have to be identified as such. When building PCRE2, the appropriate

8
testdata/wintestoutput3 vendored
View File

@ -159,7 +159,7 @@ No match
/[[:alpha:]][[:lower:]][[:upper:]]/IB /[[:alpha:]][[:lower:]][[:upper:]]/IB
------------------------------------------------------------------ ------------------------------------------------------------------
Bra Bra
[A-Za-z\x83\x8a\x8c\x8e\x9a\x9c\x9e\x9f\xaa\xb2\xb3\xb5\xb9\xba\xc0-\xd6\xd8-\xf6\xf8-\xff] [A-Za-z\x83\x8a\x8c\x8e\x9a\x9c\x9e\x9f\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\xff]
[a-z\x83\x9a\x9c\x9e\xaa\xb5\xba\xdf-\xf6\xf8-\xff] [a-z\x83\x9a\x9c\x9e\xaa\xb5\xba\xdf-\xf6\xf8-\xff]
[A-Z\x8a\x8c\x8e\x9f\xc0-\xd6\xd8-\xde] [A-Z\x8a\x8c\x8e\x9f\xc0-\xd6\xd8-\xde]
Ket Ket
@ -167,9 +167,9 @@ No match
------------------------------------------------------------------ ------------------------------------------------------------------
Capturing subpattern count = 0 Capturing subpattern count = 0
Starting code units: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Starting code units: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
a b c d e f g h i j k l m n o p q r s t u v w x y z ƒ Š Œ Ž š œ ž Ÿ ª ² ³ a b c d e f g h i j k l m n o p q r s t u v w x y z ƒ Š Œ Ž š œ ž Ÿ ª µ º
µ ¹ º À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö Ø Ù Ú Û Ü Ý Þ ß à á â À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å
ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ø ù ú û ü ý þ ÿ æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ø ù ú û ü ý þ ÿ
Subject length lower bound = 3 Subject length lower bound = 3
# End of testinput3 # End of testinput3