Revision: 1212
http://vcs.pcre.org/viewvc?view=rev&revision=1212
Author: ph10
Date: 2012-11-07 17:13:22 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Test 20 alleged it was DFA, but was not being run using -dfa. Fixed, and copied
some of the tests to the non-DFA tests.
Modified Paths:
--------------
code/trunk/RunTest
code/trunk/testdata/testinput17
code/trunk/testdata/testinput20
code/trunk/testdata/testoutput17
code/trunk/testdata/testoutput20
Modified: code/trunk/RunTest
===================================================================
--- code/trunk/RunTest 2012-11-07 17:02:03 UTC (rev 1211)
+++ code/trunk/RunTest 2012-11-07 17:13:22 UTC (rev 1212)
@@ -872,7 +872,7 @@
fi
fi
-# Tests for 16/32-bit-specific features in DFA non-UTF-16 mode
+# Tests for 16/32-bit-specific features in DFA non-UTF-16/32 mode
if [ $do20 = yes ] ; then
echo $title20
@@ -880,7 +880,7 @@
echo " Skipped when running 8-bit tests"
else
for opt in "" "-s"; do
- $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput20 testtry
+ $sim $valgrind ./pcretest -q $bmode $opt -dfa $testdata/testinput20 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput20 testtry
if [ $? != 0 ] ; then exit 1; fi
Modified: code/trunk/testdata/testinput17
===================================================================
--- code/trunk/testdata/testinput17 2012-11-07 17:02:03 UTC (rev 1211)
+++ code/trunk/testdata/testinput17 2012-11-07 17:13:22 UTC (rev 1212)
@@ -1,13 +1,12 @@
-/-- This set of tests is for the 16- and 32-bit library's basic (non-UTF-16 or -32) features
- that are not compatible with the 8-bit library, or which give different
- output in 16- or 32-bit mode. --/
+/-- This set of tests is for the 16- and 32-bit library's basic (non-UTF-16
+ or -32) features that are not compatible with the 8-bit library, or which
+ give different output in 16- or 32-bit mode. --/
/a\Cb/
aXb
a\nb
/[^\x{c4}]/DZ
-
/\x{100}/I
@@ -279,4 +278,19 @@
/\ud800/<JS>BZ
+/^\x{ffff}+/i
+ \x{ffff}
+
+/^\x{ffff}?/i
+ \x{ffff}
+
+/^\x{ffff}*/i
+ \x{ffff}
+
+/^\x{ffff}{3}/i
+ \x{ffff}\x{ffff}\x{ffff}
+
+/^\x{ffff}{0,3}/i
+ \x{ffff}
+
/-- End of testinput17 --/
Modified: code/trunk/testdata/testinput20
===================================================================
--- code/trunk/testdata/testinput20 2012-11-07 17:02:03 UTC (rev 1211)
+++ code/trunk/testdata/testinput20 2012-11-07 17:13:22 UTC (rev 1212)
@@ -1,5 +1,5 @@
-/-- These tests are for the handling of characters greater than 255 in 16-bit,
- non-UTF-16 mode, or in 32-bit mode. --/
+/-- These DFA tests are for the handling of characters greater than 255 in
+ 16- or 32-bit, non-UTF mode. --/
/^\x{ffff}+/i
\x{ffff}
Modified: code/trunk/testdata/testoutput17
===================================================================
--- code/trunk/testdata/testoutput17 2012-11-07 17:02:03 UTC (rev 1211)
+++ code/trunk/testdata/testoutput17 2012-11-07 17:13:22 UTC (rev 1212)
@@ -1,6 +1,6 @@
-/-- This set of tests is for the 16- and 32-bit library's basic (non-UTF-16 or -32) features
- that are not compatible with the 8-bit library, or which give different
- output in 16- or 32-bit mode. --/
+/-- This set of tests is for the 16- and 32-bit library's basic (non-UTF-16
+ or -32) features that are not compatible with the 8-bit library, or which
+ give different output in 16- or 32-bit mode. --/
/a\Cb/
aXb
@@ -19,7 +19,6 @@
No options
No first char
No need char
-
/\x{100}/I
Capturing subpattern count = 0
@@ -483,4 +482,24 @@
End
------------------------------------------------------------------
+/^\x{ffff}+/i
+ \x{ffff}
+ 0: \x{ffff}
+
+/^\x{ffff}?/i
+ \x{ffff}
+ 0: \x{ffff}
+
+/^\x{ffff}*/i
+ \x{ffff}
+ 0: \x{ffff}
+
+/^\x{ffff}{3}/i
+ \x{ffff}\x{ffff}\x{ffff}
+ 0: \x{ffff}\x{ffff}\x{ffff}
+
+/^\x{ffff}{0,3}/i
+ \x{ffff}
+ 0: \x{ffff}
+
/-- End of testinput17 --/
Modified: code/trunk/testdata/testoutput20
===================================================================
--- code/trunk/testdata/testoutput20 2012-11-07 17:02:03 UTC (rev 1211)
+++ code/trunk/testdata/testoutput20 2012-11-07 17:13:22 UTC (rev 1212)
@@ -1,5 +1,5 @@
-/-- These tests are for the handling of characters greater than 255 in 16-bit,
- non-UTF-16 mode, or in 32-bit mode. --/
+/-- These DFA tests are for the handling of characters greater than 255 in
+ 16- or 32-bit, non-UTF mode. --/
/^\x{ffff}+/i
\x{ffff}
@@ -8,10 +8,12 @@
/^\x{ffff}?/i
\x{ffff}
0: \x{ffff}
+ 1:
/^\x{ffff}*/i
\x{ffff}
0: \x{ffff}
+ 1:
/^\x{ffff}{3}/i
\x{ffff}\x{ffff}\x{ffff}
@@ -20,5 +22,6 @@
/^\x{ffff}{0,3}/i
\x{ffff}
0: \x{ffff}
+ 1:
/-- End of testinput20 --/
