Tidied up a lot of comments in the test files.

git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@371 6239d852-aaf2-0410-a92c-79f79f948069

1 files changed, 41 insertions, 22 deletions

diff --git a/testdata/testinput10 b/testdata/testinput10
index dc43629..1af551a 100644
--- a/testdata/testinput10
+++ b/testdata/testinput10
@@ -38,16 +38,21 @@
 
 /a\C\Cb/utf
     a\x{100}b
-    ** Failers
+\= Expect no match
     a\x{12257}b
 
+# The next 3 patterns have UTF-8 errors
+
 /[Ã]/utf
 
 /Ã/utf
 
 /ÃÃÃxxx/utf
 
+# Now test subjects
+
 /badutf/utf
+\= Expect UTF-8 errors
     X\xdf
     XX\xef
     XXX\xef\x80
@@ -89,11 +94,13 @@
     \xff
 
 /badutf/utf
+\= Expect UTF-8 errors
     XX\xfb\x80\x80\x80\x80
     XX\xfd\x80\x80\x80\x80\x80
     XX\xf7\xbf\xbf\xbf
 
 /shortutf/utf
+\= Expect UTF-8 errors
     XX\xdf\=ph
     XX\xef\=ph
     XX\xef\x80\=ph
@@ -111,6 +118,7 @@
     \xfd\x80\x80\x80\x80\=ph
 
 /anything/utf
+\= Expect UTF-8 errors
     X\xc0\x80
     XX\xc1\x8f
     XXX\xe0\x9f\x80
@@ -119,15 +127,16 @@
     \xfc\x83\x80\x80\x80\x80
     \xfe\x80\x80\x80\x80\x80
     \xff\x80\x80\x80\x80\x80
+    \xf8\x88\x80\x80\x80
+    \xf9\x87\x80\x80\x80
+    \xfc\x84\x80\x80\x80\x80
+    \xfd\x83\x80\x80\x80\x80
+\= Expect no match
     \xc3\x8f
     \xe0\xaf\x80
     \xe1\x80\x80
     \xf0\x9f\x80\x80
     \xf1\x8f\x80\x80
-    \xf8\x88\x80\x80\x80
-    \xf9\x87\x80\x80\x80
-    \xfc\x84\x80\x80\x80\x80
-    \xfd\x83\x80\x80\x80\x80
     \xf8\x88\x80\x80\x80\=no_utf_check
     \xf9\x87\x80\x80\x80\=no_utf_check
     \xfc\x84\x80\x80\x80\x80\=no_utf_check
@@ -136,31 +145,38 @@
 # Similar tests with offsets
 
 /badutf/utf
+\= Expect UTF-8 errors
     X\xdfabcd
     X\xdfabcd\=offset=1
+\= Expect no match
     X\xdfabcd\=offset=2
 
 /(?<=x)badutf/utf
+\= Expect UTF-8 errors
     X\xdfabcd
     X\xdfabcd\=offset=1
     X\xdfabcd\=offset=2
-    X\xdfabcd\=offset=3
     X\xdfabcd\xdf\=offset=3
+\= Expect no match
+    X\xdfabcd\=offset=3
 
 /(?<=xx)badutf/utf
+\= Expect UTF-8 errors
     X\xdfabcd
     X\xdfabcd\=offset=1
     X\xdfabcd\=offset=2
     X\xdfabcd\=offset=3
 
 /(?<=xxxx)badutf/utf
+\= Expect UTF-8 errors
     X\xdfabcd
     X\xdfabcd\=offset=1
     X\xdfabcd\=offset=2
     X\xdfabcd\=offset=3
-    X\xdfabcd\=offset=6
     X\xdfabc\xdf\=offset=6
     X\xdfabc\xdf\=offset=7
+\= Expect no match
+    X\xdfabcd\=offset=6
  
 /\x{100}/IB,utf
 
@@ -208,7 +224,7 @@
 # correctly, but that messes up comparisons).
 
 /a\Cb/utf
-    *** Failers
+\= Expect no match
     a\x{100}b
 
 /[^ab\xC0-\xF0]/IB,utf
@@ -216,7 +232,7 @@
     \x{bf}
     \x{100}
     \x{1000}
-    *** Failers
+\= Expect no match
     \x{c0}
     \x{f0}
 
@@ -243,7 +259,6 @@
     \x{100}
     Z\x{100}
     \x{100}Z
-    *** Failers
 
 /[\xff]/IB,utf
     >\x{ff}<
@@ -265,21 +280,23 @@
 # This tests the stricter UTF-8 check according to RFC 3629.
 
 /X/utf
+\= Expect UTF-8 errors
     \x{d800}
-    \x{d800}\=no_utf_check
     \x{da00}
-    \x{da00}\=no_utf_check
     \x{dfff}
-    \x{dfff}\=no_utf_check
     \x{110000}
-    \x{110000}\=no_utf_check
     \x{2000000}
-    \x{2000000}\=no_utf_check
     \x{7fffffff}
+\= Expect no match
+    \x{d800}\=no_utf_check
+    \x{da00}\=no_utf_check
+    \x{dfff}\=no_utf_check
+    \x{110000}\=no_utf_check
+    \x{2000000}\=no_utf_check
     \x{7fffffff}\=no_utf_check
 
 /(*UTF8)\x{1234}/
-  abcd\x{1234}pqr
+    abcd\x{1234}pqr
 
 /(*CRLF)(*UTF)(*BSR_UNICODE)a\Rb/I
 
@@ -319,11 +336,14 @@
 
 /a+/utf
     a\x{123}aa\=offset=1
-    a\x{123}aa\=offset=2
     a\x{123}aa\=offset=3
     a\x{123}aa\=offset=4
-    a\x{123}aa\=offset=5
+\= Expect bad offset value
     a\x{123}aa\=offset=6
+\= Expect bad UTF-8 offset     
+    a\x{123}aa\=offset=2
+\= Expect no match
+    a\x{123}aa\=offset=5
 
 /\x{1234}+/Ii,utf
 
@@ -424,7 +444,6 @@
     Z\x{100}
     \x{100}
     \x{100}Z
-    *** Failers 
 
 /[z-\x{100}]/IB,utf
 
@@ -450,7 +469,7 @@
     \x{104}
     \x{105}
     \x{109}  
-    ** Failers
+\= Expect no match
     \x{100}
     \x{10a} 
     
@@ -464,7 +483,7 @@
     \x{ff}
     \x{100}
     \x{101} 
-    ** Failers
+\= Expect no match
     \x{102}
     Y
     y           
@@ -474,6 +493,6 @@
 /\x{3a3}B/IBi,utf
 
 /abc/utf,replace=Ã
-   abc
+    abc
 
 # End of testinput10