Revision: 690
http://vcs.pcre.org/viewvc?view=rev&revision=690
Author: ph10
Date: 2011-09-10 17:19:31 +0100 (Sat, 10 Sep 2011)
Log Message:
-----------
Update full set of tests with many configurations.
Modified Paths:
--------------
code/trunk/Makefile.am
code/trunk/configure.ac
code/trunk/maint/ManyConfigTests
code/trunk/testdata/testinput14
code/trunk/testdata/testinput15
code/trunk/testdata/testoutput14
code/trunk/testdata/testoutput15
Modified: code/trunk/Makefile.am
===================================================================
--- code/trunk/Makefile.am 2011-09-09 10:34:57 UTC (rev 689)
+++ code/trunk/Makefile.am 2011-09-10 16:19:31 UTC (rev 690)
@@ -228,12 +228,14 @@
CLEANFILES += pcre_chartables.c
-## If JIT support is enabled, arrange for the JIT test program to run.
+## If JIT support and UTF-8 is enabled, arrange for the JIT test program to run.
if WITH_JIT
+if WITH_UTF8
TESTS += pcre_jit_test
noinst_PROGRAMS += pcre_jit_test
pcre_jit_test_SOURCES = pcre_jit_test.c
pcre_jit_test_LDADD = libpcre.la
+endif # WITH_UTF8
endif # WITH_JIT
## A version of the main pcre library that has a posix re API.
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2011-09-09 10:34:57 UTC (rev 689)
+++ code/trunk/configure.ac 2011-09-10 16:19:31 UTC (rev 690)
@@ -413,6 +413,7 @@
AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")
AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")
+AM_CONDITIONAL(WITH_UTF8, test "x$enable_utf8" = "xyes")
# Checks for typedefs, structures, and compiler characteristics.
Modified: code/trunk/maint/ManyConfigTests
===================================================================
--- code/trunk/maint/ManyConfigTests 2011-09-09 10:34:57 UTC (rev 689)
+++ code/trunk/maint/ManyConfigTests 2011-09-10 16:19:31 UTC (rev 690)
@@ -66,6 +66,8 @@
conf=`./pcretest -C`
nl=`expr match "$conf" ".*Newline sequence is \([A-Z]*\)"`
+ jit=`expr match "$conf" ".*[^o] Just-in-time"`
+ utf8=`expr match "$conf" ".*[^o] UTF-8 support"`
if [ "$nl" = "LF" -o "$nl" = "ANY" ]; then
echo "Running C library tests"
@@ -94,6 +96,20 @@
echo "Skipping pcregrep tests: newline is $nl"
fi
+ if [ "$jit" -gt 0 -a $utf8 -gt 0 ]; then
+ echo "Running JIT regression tests"
+ $srcdir/pcre_jit_test >teststdout 2>teststderr
+ if [ $? -ne 0 ]; then
+ echo " "
+ echo "**** Test failed ****"
+ cat teststderr
+ cat teststdout
+ exit 1
+ fi
+ else
+ echo "Skipping JIT regression tests: JIT or UTF-8 not enabled"
+ fi
+
if [ "$nl" = "LF" -o "$nl" = "ANY" ]; then
if [ -f pcrecpp_unittest ] ; then
for utest in pcrecpp_unittest \
@@ -130,8 +146,8 @@
for opts in \
"" \
"--enable-utf8 --disable-static" \
- "--disable-stack-for-recursion" \
- "--enable-utf8 --disable-stack-for-recursion" \
+ "--disable-stack-for-recursion --disable-shared" \
+ "--enable-utf8 --disable-stack-for-recursion --disable-shared" \
"--enable-unicode-properties --disable-shared" \
"--enable-unicode-properties --disable-stack-for-recursion --disable-shared" \
"--enable-unicode-properties --disable-cpp --with-link-size=3 --disable-shared" \
@@ -141,8 +157,9 @@
"--enable-newline-is-crlf --disable-shared" \
"--enable-newline-is-anycrlf --enable-bsr-anycrlf --disable-shared" \
"--enable-utf8 --enable-newline-is-any --enable-unicode-properties --disable-stack-for-recursion --disable-static --disable-cpp" \
- "--enable-jit --enable-unicode-properties" \
- "--enable-jit --enable-unicode-properties --with-link-size=3"
+ "--enable-jit --disable-shared" \
+ "--enable-jit --enable-unicode-properties --disable-shared" \
+ "--enable-jit --enable-unicode-properties --with-link-size=3 --disable-shared"
do
runtest
done
Modified: code/trunk/testdata/testinput14
===================================================================
--- code/trunk/testdata/testinput14 2011-09-09 10:34:57 UTC (rev 689)
+++ code/trunk/testdata/testinput14 2011-09-10 16:19:31 UTC (rev 690)
@@ -11,6 +11,6 @@
<testsavedregex
abc
-/\p{Xps}*/SI
+/a*/SI
/-- End of testinput14 --/
Modified: code/trunk/testdata/testinput15
===================================================================
--- code/trunk/testdata/testinput15 2011-09-09 10:34:57 UTC (rev 689)
+++ code/trunk/testdata/testinput15 2011-09-10 16:19:31 UTC (rev 690)
@@ -4,6 +4,6 @@
/abc/S+I
-/\p{Xps}*/SI
+/a*/SI
/-- End of testinput15 --/
Modified: code/trunk/testdata/testoutput14
===================================================================
--- code/trunk/testdata/testoutput14 2011-09-09 10:34:57 UTC (rev 689)
+++ code/trunk/testdata/testoutput14 2011-09-10 16:19:31 UTC (rev 690)
@@ -37,7 +37,7 @@
abc
0: abc
-/\p{Xps}*/SI
+/a*/SI
Capturing subpattern count = 0
No options
No first char
Modified: code/trunk/testdata/testoutput15
===================================================================
--- code/trunk/testdata/testoutput15 2011-09-09 10:34:57 UTC (rev 689)
+++ code/trunk/testdata/testoutput15 2011-09-10 16:19:31 UTC (rev 690)
@@ -11,7 +11,7 @@
No set of starting bytes
JIT support is not available in this version of PCRE
-/\p{Xps}*/SI
+/a*/SI
Capturing subpattern count = 0
No options
No first char
