Some UTF-8 tests were in the wrong file.

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

5 files changed, 27 insertions, 21 deletions

diff --git a/RunTest b/RunTest
index 3a5a9db..b98bb96 100755
--- a/RunTest
+++ b/RunTest
@@ -222,7 +222,7 @@ fi
 # PCRE tests that are not JIT or Perl-compatible: API, errors, internals
 
 if [ $do2 = yes ] ; then
-  echo "Test 2: API, errors, internals, and non-Perl stuff"
+  echo "Test 2: API, errors, internals, and non-Perl stuff (not UTF-8)"
   for opt in "" "-s" $jitopt; do
     $sim $valgrind ./pcretest -q $opt $testdata/testinput2 testtry
     if [ $? = 0 ] ; then
diff --git a/testdata/testinput13 b/testdata/testinput13
index 141bf65..e91c24e 100644
--- a/testdata/testinput13
+++ b/testdata/testinput13
@@ -573,4 +573,11 @@ of case for anything other than the ASCII letters. --/
 /^\X/8 
     ́réo
 
+/^a\X41z/<JS>
+    aX41z
+    *** Failers
+    aAz
+
+/(?<=ab\Cde)X/8
+
 /-- End of testinput13 --/
diff --git a/testdata/testinput2 b/testdata/testinput2
index 39957e3..c656cc0 100644
--- a/testdata/testinput2
+++ b/testdata/testinput2
@@ -3,7 +3,10 @@
     It also checks the non-Perl syntax the PCRE supports (Python, .NET, 
     Oniguruma). Finally, there are some tests where PCRE and Perl differ, 
     either because PCRE can't be compatible, or there is a possible Perl 
-    bug. --/  
+    bug.
+    
+    NOTE: This is a non-UTF-8 set of tests. When UTF-8 is needed, use test
+    5, and if Unicode Property Support is needed, use test 13. --/  
   
 /-- Originally, the Perl >= 5.10 things were in here too, but now I have 
     separated many (most?) of them out into test 11. However, there may still 
@@ -3980,11 +3983,6 @@ AbcdCBefgBhiBqz
 /^a\x1z/<JS>
     ax1z
 
-/^a\X41z/<JS>
-    aX41z
-    *** Failers
-    aAz
-
 /^a\u0041z/<JS>
     aAz
     *** Failers
@@ -4007,8 +4005,6 @@ AbcdCBefgBhiBqz
 
 /(?(?=c)c|d)*+Y/BZ
 
-/(?<=ab\Cde)X/8
-
 /a[\NB]c/
     aNc
     
diff --git a/testdata/testoutput13 b/testdata/testoutput13
index 5dab51d..13cc0d0 100644
--- a/testdata/testoutput13
+++ b/testdata/testoutput13
@@ -1278,4 +1278,15 @@ No match
     ́réo
 No match
 
+/^a\X41z/<JS>
+    aX41z
+ 0: aX41z
+    *** Failers
+No match
+    aAz
+No match
+
+/(?<=ab\Cde)X/8
+Failed: \C not allowed in lookbehind assertion at offset 10
+
 /-- End of testinput13 --/
diff --git a/testdata/testoutput2 b/testdata/testoutput2
index 20bc52f..97b9f29 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -3,7 +3,10 @@
     It also checks the non-Perl syntax the PCRE supports (Python, .NET, 
     Oniguruma). Finally, there are some tests where PCRE and Perl differ, 
     either because PCRE can't be compatible, or there is a possible Perl 
-    bug. --/  
+    bug.
+    
+    NOTE: This is a non-UTF-8 set of tests. When UTF-8 is needed, use test
+    5, and if Unicode Property Support is needed, use test 13. --/  
   
 /-- Originally, the Perl >= 5.10 things were in here too, but now I have 
     separated many (most?) of them out into test 11. However, there may still 
@@ -12518,14 +12521,6 @@ No match
     ax1z
  0: ax1z
 
-/^a\X41z/<JS>
-    aX41z
- 0: aX41z
-    *** Failers
-No match
-    aAz
-No match
-
 /^a\u0041z/<JS>
     aAz
  0: aAz
@@ -12591,9 +12586,6 @@ No match
         End
 ------------------------------------------------------------------
 
-/(?<=ab\Cde)X/8
-Failed: \C not allowed in lookbehind assertion at offset 10
-
 /a[\NB]c/
 Failed: \N is not supported in a class at offset 3