Move tests that are now Perl-compatible from test 2 to test 1.

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

4 files changed, 64 insertions, 64 deletions

diff --git a/testdata/testinput1 b/testdata/testinput1
index 50bdf23..232a45e 100644
--- a/testdata/testinput1
+++ b/testdata/testinput1
@@ -5549,4 +5549,31 @@ AbcdCBefgBhiBqz
 /(?=b(*THEN)a)bn|bnn/
     bnn
     
+ /^(?!a(*SKIP)b)/
+     ac
+
+ /^(?!a(*SKIP)b)../
+     acd
+
+/(?!a(*SKIP)b)../
+     acd
+
+/^(?(?!a(*SKIP)b))/
+     ac
+
+/^(?!a(*PRUNE)b)../
+     acd
+
+/(?!a(*PRUNE)b)../
+     acd
+
+ /(?!a(*COMMIT)b)ac|cd/
+     ac
+
+/\A.*?(?:a|bc)/
+    ba
+
+/^(A(*THEN)B|C(*THEN)D)/
+    CD           
+
 /-- End of testinput1 --/
diff --git a/testdata/testinput2 b/testdata/testinput2
index 0d05358..972ecf3 100644
--- a/testdata/testinput2
+++ b/testdata/testinput2
@@ -3762,27 +3762,6 @@ settings of the anchored and startline bits. --/
 /-- Here are some that Perl treats differently because of the way it handles
 backtracking verbs. --/
 
- /^(?!a(*SKIP)b)/
-     ac
-
- /^(?!a(*SKIP)b)../
-     acd
-
-/(?!a(*SKIP)b)../
-     acd
-
-/^(?(?!a(*SKIP)b))/
-     ac
-
-/^(?!a(*PRUNE)b)../
-     acd
-
-/(?!a(*PRUNE)b)../
-     acd
-
- /(?!a(*COMMIT)b)ac|cd/
-     ac
-
  /(?!a(*COMMIT)b)ac|ad/
      ac
      ad 
@@ -3797,9 +3776,6 @@ backtracking verbs. --/
 /\A.*?(?:a|b(*THEN)c)/
     ba
 
-/\A.*?(?:a|bc)/
-    ba
-
 /\A.*?(?:a|b(*THEN)c)++/
     ba
 
@@ -3812,9 +3788,6 @@ backtracking verbs. --/
 /\A.*?(a|b(*THEN)c)/
     ba
 
-/^(A(*THEN)B|C(*THEN)D)/
-    CD           
-
 /^(A(*THEN)B|A(*THEN)D)/
     AD           
     
diff --git a/testdata/testoutput1 b/testdata/testoutput1
index f9fab09..39e9e59 100644
--- a/testdata/testoutput1
+++ b/testdata/testoutput1
@@ -9116,4 +9116,41 @@ No match
     bnn
  0: bnn
     
+ /^(?!a(*SKIP)b)/
+     ac
+ 0: 
+
+ /^(?!a(*SKIP)b)../
+     acd
+ 0: ac
+
+/(?!a(*SKIP)b)../
+     acd
+ 0: ac
+
+/^(?(?!a(*SKIP)b))/
+     ac
+ 0: 
+
+/^(?!a(*PRUNE)b)../
+     acd
+ 0: ac
+
+/(?!a(*PRUNE)b)../
+     acd
+ 0: ac
+
+ /(?!a(*COMMIT)b)ac|cd/
+     ac
+ 0: ac
+
+/\A.*?(?:a|bc)/
+    ba
+ 0: ba
+
+/^(A(*THEN)B|C(*THEN)D)/
+    CD           
+ 0: CD
+ 1: CD
+
 /-- End of testinput1 --/
diff --git a/testdata/testoutput2 b/testdata/testoutput2
index 56db934..a3f799a 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -12518,34 +12518,6 @@ Partial match: 123a
 /-- Here are some that Perl treats differently because of the way it handles
 backtracking verbs. --/
 
- /^(?!a(*SKIP)b)/
-     ac
- 0: 
-
- /^(?!a(*SKIP)b)../
-     acd
- 0: ac
-
-/(?!a(*SKIP)b)../
-     acd
- 0: ac
-
-/^(?(?!a(*SKIP)b))/
-     ac
- 0: 
-
-/^(?!a(*PRUNE)b)../
-     acd
- 0: ac
-
-/(?!a(*PRUNE)b)../
-     acd
- 0: ac
-
- /(?!a(*COMMIT)b)ac|cd/
-     ac
- 0: ac
-
  /(?!a(*COMMIT)b)ac|ad/
      ac
  0: ac
@@ -12566,10 +12538,6 @@ No match
     ba
  0: ba
 
-/\A.*?(?:a|bc)/
-    ba
- 0: ba
-
 /\A.*?(?:a|b(*THEN)c)++/
     ba
  0: ba
@@ -12587,11 +12555,6 @@ No match
  0: ba
  1: a
 
-/^(A(*THEN)B|C(*THEN)D)/
-    CD           
- 0: CD
- 1: CD
-
 /^(A(*THEN)B|A(*THEN)D)/
     AD           
  0: AD