Revision: 477
http://www.exim.org/viewvc/pcre2?view=rev&revision=477
Author: ph10
Date: 2016-01-29 15:01:17 +0000 (Fri, 29 Jan 2016)
Log Message:
-----------
Patches to fix tests under Windows.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/RunTest.bat
code/trunk/configure.ac
code/trunk/src/pcre2.h
code/trunk/testdata/wintestoutput3
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2016-01-12 14:48:49 UTC (rev 476)
+++ code/trunk/ChangeLog 2016-01-29 15:01:17 UTC (rev 477)
@@ -1,6 +1,14 @@
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
-----------------------------
Modified: code/trunk/RunTest.bat
===================================================================
--- code/trunk/RunTest.bat 2016-01-12 14:48:49 UTC (rev 476)
+++ code/trunk/RunTest.bat 2016-01-29 15:01:17 UTC (rev 477)
@@ -242,11 +242,18 @@
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 testoutput=testoutput%1
+set testoutput=testoutput%outnum%
if exist %srcdir%\testdata\win%testinput% (
set testinput=wintestinput%1
- set testoutput=wintestoutput%1
+ set testoutput=wintestoutput%outnum%
)
echo Test %1: %3
@@ -259,9 +266,6 @@
)
set type=
-if [%1]==[8] (
- set type=-%bits%
-)
if [%1]==[11] (
set type=-%bits%
)
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2016-01-12 14:48:49 UTC (rev 476)
+++ code/trunk/configure.ac 2016-01-29 15:01:17 UTC (rev 477)
@@ -9,9 +9,9 @@
dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre2_major, [10])
-m4_define(pcre2_minor, [21])
-m4_define(pcre2_prerelease, [])
-m4_define(pcre2_date, [2016-01-12])
+m4_define(pcre2_minor, [22])
+m4_define(pcre2_prerelease, [-RC1])
+m4_define(pcre2_date, [2016-01-29])
# 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.
Modified: code/trunk/src/pcre2.h
===================================================================
--- code/trunk/src/pcre2.h 2016-01-12 14:48:49 UTC (rev 476)
+++ code/trunk/src/pcre2.h 2016-01-29 15:01:17 UTC (rev 477)
@@ -42,9 +42,9 @@
/* The current PCRE version information. */
#define PCRE2_MAJOR 10
-#define PCRE2_MINOR 21
-#define PCRE2_PRERELEASE
-#define PCRE2_DATE 2016-01-12
+#define PCRE2_MINOR 22
+#define PCRE2_PRERELEASE -RC1
+#define PCRE2_DATE 2016-01-29
/* 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
Modified: code/trunk/testdata/wintestoutput3
===================================================================
--- code/trunk/testdata/wintestoutput3 2016-01-12 14:48:49 UTC (rev 476)
+++ code/trunk/testdata/wintestoutput3 2016-01-29 15:01:17 UTC (rev 477)
@@ -159,7 +159,7 @@
/[[:alpha:]][[:lower:]][[:upper:]]/IB
------------------------------------------------------------------
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\x8a\x8c\x8e\x9f\xc0-\xd6\xd8-\xde]
Ket
@@ -167,9 +167,9 @@
------------------------------------------------------------------
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
- 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 \x83 \x8A \x8C \x8E \x9A \x9C \x9E \x9F \xAA \xB2 \xB3
- \xB5 \xB9 \xBA \xC0 \xC1 \xC2 \xC3 \xC4 \xC5 \xC6 \xC7 \xC8 \xC9 \xCA \xCB \xCC \xCD \xCE \xCF \xD0 \xD1 \xD2 \xD3 \xD4 \xD5 \xD6 \xD8 \xD9 \xDA \xDB \xDC \xDD \xDE \xDF \xE0 \xE1 \xE2
- \xE3 \xE4 \xE5 \xE6 \xE7 \xE8 \xE9 \xEA \xEB \xEC \xED \xEE \xEF \xF0 \xF1 \xF2 \xF3 \xF4 \xF5 \xF6 \xF8 \xF9 \xFA \xFB \xFC \xFD \xFE \xFF
+ 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 \x83 \x8A \x8C \x8E \x9A \x9C \x9E \x9F \xAA \xB5 \xBA
+ \xC0 \xC1 \xC2 \xC3 \xC4 \xC5 \xC6 \xC7 \xC8 \xC9 \xCA \xCB \xCC \xCD \xCE \xCF \xD0 \xD1 \xD2 \xD3 \xD4 \xD5 \xD6 \xD8 \xD9 \xDA \xDB \xDC \xDD \xDE \xDF \xE0 \xE1 \xE2 \xE3 \xE4 \xE5
+ \xE6 \xE7 \xE8 \xE9 \xEA \xEB \xEC \xED \xEE \xEF \xF0 \xF1 \xF2 \xF3 \xF4 \xF5 \xF6 \xF8 \xF9 \xFA \xFB \xFC \xFD \xFE \xFF
Subject length lower bound = 3
# End of testinput3
