Some tests were in the wrong files.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@973 2f5784b3-3f2a-0410-8824-cb99058d5e15

8 files changed, 173 insertions, 175 deletions

diff --git a/testdata/testinput10 b/testdata/testinput10
index 6cdcc41..7856518 100644
--- a/testdata/testinput10
+++ b/testdata/testinput10
@@ -994,4 +994,36 @@
 /[^\x{100}]+/8i
     \x{100}\x{101}XX
 
+/^\X/8
+    A\P
+    A\P\P 
+    A\x{300}\x{301}\P
+    A\x{300}\x{301}\P\P  
+    A\x{301}\P
+    A\x{301}\P\P  
+    
+/^\X{2,3}/8
+    A\P
+    A\P\P 
+    AA\P
+    AA\P\P  
+    A\x{300}\x{301}\P
+    A\x{300}\x{301}\P\P  
+    A\x{300}\x{301}A\x{300}\x{301}\P
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+
+/^\X{2}/8
+    AA\P
+    AA\P\P  
+    A\x{300}\x{301}A\x{300}\x{301}\P
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+    
+/^\X+/8
+    AA\P
+    AA\P\P  
+
+/^\X+?Z/8
+    AA\P
+    AA\P\P 
+
 /-- End of testinput10 --/ 
diff --git a/testdata/testinput5 b/testdata/testinput5
index 35cf055..008e660 100644
--- a/testdata/testinput5
+++ b/testdata/testinput5
@@ -730,39 +730,6 @@
     abaBabA\P
     abAbABaBx\P
 
-/^\X/8
-    A\P
-    A\P\P 
-    A\x{300}\x{301}\P
-    A\x{300}\x{301}\P\P  
-    A\x{301}\P
-    A\x{301}\P\P  
-    
-/^\X{2,3}/8
-    A\P
-    A\P\P 
-    AA\P
-    AA\P\P  
-    A\x{300}\x{301}\P
-    A\x{300}\x{301}\P\P  
-    A\x{300}\x{301}A\x{300}\x{301}\P
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-
-/^\X{2}/8
-    AA\P
-    AA\P\P  
-    A\x{300}\x{301}A\x{300}\x{301}\P
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-    
-/^\X+/8
-    AA\P
-    AA\P\P  
-
-/^\X+?Z/8
-    AA\P
-    AA\P\P 
-
-
 /./8<CRLF>
     \r\P
     \r\P\P 
diff --git a/testdata/testinput7 b/testdata/testinput7
index e3164db..6ef9230 100644
--- a/testdata/testinput7
+++ b/testdata/testinput7
@@ -590,4 +590,36 @@ of case for anything other than the ASCII letters. --/
 /\p{Takri}\d/8W
     \x{11680}\x{116c0}
 
+/^\X/8
+    A\P
+    A\P\P 
+    A\x{300}\x{301}\P
+    A\x{300}\x{301}\P\P  
+    A\x{301}\P
+    A\x{301}\P\P  
+    
+/^\X{2,3}/8
+    A\P
+    A\P\P 
+    AA\P
+    AA\P\P  
+    A\x{300}\x{301}\P
+    A\x{300}\x{301}\P\P  
+    A\x{300}\x{301}A\x{300}\x{301}\P
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+
+/^\X{2}/8
+    AA\P
+    AA\P\P  
+    A\x{300}\x{301}A\x{300}\x{301}\P
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+    
+/^\X+/8
+    AA\P
+    AA\P\P  
+
+/^\X+?Z/8
+    AA\P
+    AA\P\P 
+
 /-- End of testinput7 --/
diff --git a/testdata/testinput9 b/testdata/testinput9
index d9a1d9d..766c9c0 100644
--- a/testdata/testinput9
+++ b/testdata/testinput9
@@ -688,38 +688,6 @@
 
 /(?<=ab\Cde)X/8
 
-/^\X/8
-    A\P
-    A\P\P 
-    A\x{300}\x{301}\P
-    A\x{300}\x{301}\P\P  
-    A\x{301}\P
-    A\x{301}\P\P  
-    
-/^\X{2,3}/8
-    A\P
-    A\P\P 
-    AA\P
-    AA\P\P  
-    A\x{300}\x{301}\P
-    A\x{300}\x{301}\P\P  
-    A\x{300}\x{301}A\x{300}\x{301}\P
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-
-/^\X{2}/8
-    AA\P
-    AA\P\P  
-    A\x{300}\x{301}A\x{300}\x{301}\P
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-    
-/^\X+/8
-    AA\P
-    AA\P\P  
-
-/^\X+?Z/8
-    AA\P
-    AA\P\P 
-
 /./8<CRLF>
     \r\P
     \r\P\P 
diff --git a/testdata/testoutput10 b/testdata/testoutput10
index cc94a34..5009d5d 100644
--- a/testdata/testoutput10
+++ b/testdata/testoutput10
@@ -2045,4 +2045,59 @@ No match
  0: XX
  1: X
 
+/^\X/8
+    A\P
+ 0: A
+    A\P\P 
+Partial match: A
+    A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}
+    A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}
+    A\x{301}\P
+ 0: A\x{301}
+    A\x{301}\P\P  
+Partial match: A\x{301}
+    
+/^\X{2,3}/8
+    A\P
+Partial match: A
+    A\P\P 
+Partial match: A
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+    A\x{300}\x{301}\P
+Partial match: A\x{300}\x{301}
+    A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}A\x{300}\x{301}
+
+/^\X{2}/8
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+    A\x{300}\x{301}A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}A\x{300}\x{301}
+    
+/^\X+/8
+    AA\P
+ 0: AA
+ 1: A
+    AA\P\P  
+Partial match: AA
+
+/^\X+?Z/8
+    AA\P
+Partial match: AA
+    AA\P\P 
+Partial match: AA
+
 /-- End of testinput10 --/ 
diff --git a/testdata/testoutput5 b/testdata/testoutput5
index 2d44685..dfabd5a 100644
--- a/testdata/testoutput5
+++ b/testdata/testoutput5
@@ -1724,61 +1724,6 @@ Partial match: abaBabA
  0: abAbABaBx
  1: ab
 
-/^\X/8
-    A\P
- 0: A
-    A\P\P 
-Partial match: A
-    A\x{300}\x{301}\P
- 0: A\x{300}\x{301}
-    A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}
-    A\x{301}\P
- 0: A\x{301}
-    A\x{301}\P\P  
-Partial match: A\x{301}
-    
-/^\X{2,3}/8
-    A\P
-Partial match: A
-    A\P\P 
-Partial match: A
-    AA\P
- 0: AA
-    AA\P\P  
-Partial match: AA
-    A\x{300}\x{301}\P
-Partial match: A\x{300}\x{301}
-    A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}
-    A\x{300}\x{301}A\x{300}\x{301}\P
- 0: A\x{300}\x{301}A\x{300}\x{301}
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}A\x{300}\x{301}
-
-/^\X{2}/8
-    AA\P
- 0: AA
-    AA\P\P  
-Partial match: AA
-    A\x{300}\x{301}A\x{300}\x{301}\P
- 0: A\x{300}\x{301}A\x{300}\x{301}
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}A\x{300}\x{301}
-    
-/^\X+/8
-    AA\P
- 0: AA
-    AA\P\P  
-Partial match: AA
-
-/^\X+?Z/8
-    AA\P
-Partial match: AA
-    AA\P\P 
-Partial match: AA
-
-
 /./8<CRLF>
     \r\P
  0: \x{0d}
diff --git a/testdata/testoutput7 b/testdata/testoutput7
index 12f096f..ccfdad9 100644
--- a/testdata/testoutput7
+++ b/testdata/testoutput7
@@ -1259,4 +1259,58 @@ Partial match: ab
     \x{11680}\x{116c0}
  0: \x{11680}\x{116c0}
 
+/^\X/8
+    A\P
+ 0: A
+    A\P\P 
+Partial match: A
+    A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}
+    A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}
+    A\x{301}\P
+ 0: A\x{301}
+    A\x{301}\P\P  
+Partial match: A\x{301}
+    
+/^\X{2,3}/8
+    A\P
+Partial match: A
+    A\P\P 
+Partial match: A
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+    A\x{300}\x{301}\P
+Partial match: A\x{300}\x{301}
+    A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}A\x{300}\x{301}
+
+/^\X{2}/8
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+    A\x{300}\x{301}A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}A\x{300}\x{301}
+    
+/^\X+/8
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+
+/^\X+?Z/8
+    AA\P
+Partial match: AA
+    AA\P\P 
+Partial match: AA
+
 /-- End of testinput7 --/
diff --git a/testdata/testoutput9 b/testdata/testoutput9
index 548c341..95cd618 100644
--- a/testdata/testoutput9
+++ b/testdata/testoutput9
@@ -1323,61 +1323,6 @@ Error -16 (item unsupported for DFA matching)
 /(?<=ab\Cde)X/8
 Failed: \C not allowed in lookbehind assertion at offset 10
 
-/^\X/8
-    A\P
- 0: A
-    A\P\P 
-Partial match: A
-    A\x{300}\x{301}\P
- 0: A\x{300}\x{301}
-    A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}
-    A\x{301}\P
- 0: A\x{301}
-    A\x{301}\P\P  
-Partial match: A\x{301}
-    
-/^\X{2,3}/8
-    A\P
-Partial match: A
-    A\P\P 
-Partial match: A
-    AA\P
- 0: AA
-    AA\P\P  
-Partial match: AA
-    A\x{300}\x{301}\P
-Partial match: A\x{300}\x{301}
-    A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}
-    A\x{300}\x{301}A\x{300}\x{301}\P
- 0: A\x{300}\x{301}A\x{300}\x{301}
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}A\x{300}\x{301}
-
-/^\X{2}/8
-    AA\P
- 0: AA
-    AA\P\P  
-Partial match: AA
-    A\x{300}\x{301}A\x{300}\x{301}\P
- 0: A\x{300}\x{301}A\x{300}\x{301}
-    A\x{300}\x{301}A\x{300}\x{301}\P\P  
-Partial match: A\x{300}\x{301}A\x{300}\x{301}
-    
-/^\X+/8
-    AA\P
- 0: AA
- 1: A
-    AA\P\P  
-Partial match: AA
-
-/^\X+?Z/8
-    AA\P
-Partial match: AA
-    AA\P\P 
-Partial match: AA
-
 /./8<CRLF>
     \r\P
  0: \x{0d}