From 255974ed28e94b3ceddb3eea7bd4760cd2afc1a3 Mon Sep 17 00:00:00 2001 From: "Philip.Hazel" Date: Tue, 15 Dec 2015 18:21:49 +0000 Subject: [PATCH] Some tests were in the wrong files. --- testdata/testinput2 | 2 -- testdata/testinput21 | 2 +- testdata/testinput22 | 2 +- testdata/testinput5 | 2 -- testdata/testoutput2 | 7 ------- testdata/testoutput21 | 7 ++++++- testdata/testoutput22-16 | 8 +++++++- testdata/testoutput22-32 | 8 +++++++- testdata/testoutput22-8 | 8 +++++++- testdata/testoutput5 | 8 -------- 10 files changed, 29 insertions(+), 25 deletions(-) diff --git a/testdata/testinput2 b/testdata/testinput2 index 461bc0a..c06e440 100644 --- a/testdata/testinput2 +++ b/testdata/testinput2 @@ -11,8 +11,6 @@ #forbid_utf #newline_default lf any anycrlf -/abc\Cdef/info - # Test binary zeroes in the pattern # /a\0B/ where 0 is a binary zero diff --git a/testdata/testinput21 b/testdata/testinput21 index 2acb4bb..1d1fbed 100644 --- a/testdata/testinput21 +++ b/testdata/testinput21 @@ -7,7 +7,7 @@ /ab\Cde/never_backslash_c -/ab\Cde/ +/ab\Cde/info abXde /(?<=ab\Cde)X/ diff --git a/testdata/testinput22 b/testdata/testinput22 index 2bd9e19..f684cf4 100644 --- a/testdata/testinput22 +++ b/testdata/testinput22 @@ -3,7 +3,7 @@ # of this test is different in 8-, 16-, and 32-bit modes. Some tests may match # in some widths and not in others. -/ab\Cde/utf +/ab\Cde/utf,info abXde # This should produce an error diagnostic (\C in UTF lookbehind) diff --git a/testdata/testinput5 b/testdata/testinput5 index eeb0bff..2e13a7c 100644 --- a/testdata/testinput5 +++ b/testdata/testinput5 @@ -1689,8 +1689,6 @@ /abc/utf,replace=xyz abc\=zero_terminate -/abc\Cdef/info,utf - /a[[:punct:]b]/ucp,bincode /a[[:punct:]b]/utf,ucp,bincode diff --git a/testdata/testoutput2 b/testdata/testoutput2 index 91bca64..6dfd3ea 100644 --- a/testdata/testoutput2 +++ b/testdata/testoutput2 @@ -11,13 +11,6 @@ #forbid_utf #newline_default lf any anycrlf -/abc\Cdef/info -Capturing subpattern count = 0 -Contains \C -First code unit = 'a' -Last code unit = 'f' -Subject length lower bound = 7 - # Test binary zeroes in the pattern # /a\0B/ where 0 is a binary zero diff --git a/testdata/testoutput21 b/testdata/testoutput21 index 966a574..6bf3f60 100644 --- a/testdata/testoutput21 +++ b/testdata/testoutput21 @@ -78,7 +78,12 @@ /ab\Cde/never_backslash_c Failed: error 183 at offset 3: using \C is disabled by the application -/ab\Cde/ +/ab\Cde/info +Capturing subpattern count = 0 +Contains \C +First code unit = 'a' +Last code unit = 'e' +Subject length lower bound = 5 abXde 0: abXde diff --git a/testdata/testoutput22-16 b/testdata/testoutput22-16 index 21a649e..ca1fd76 100644 --- a/testdata/testoutput22-16 +++ b/testdata/testoutput22-16 @@ -3,7 +3,13 @@ # of this test is different in 8-, 16-, and 32-bit modes. Some tests may match # in some widths and not in others. -/ab\Cde/utf +/ab\Cde/utf,info +Capturing subpattern count = 0 +Contains \C +Options: utf +First code unit = 'a' +Last code unit = 'e' +Subject length lower bound = 0 abXde 0: abXde diff --git a/testdata/testoutput22-32 b/testdata/testoutput22-32 index fff7ff0..91d0b05 100644 --- a/testdata/testoutput22-32 +++ b/testdata/testoutput22-32 @@ -3,7 +3,13 @@ # of this test is different in 8-, 16-, and 32-bit modes. Some tests may match # in some widths and not in others. -/ab\Cde/utf +/ab\Cde/utf,info +Capturing subpattern count = 0 +Contains \C +Options: utf +First code unit = 'a' +Last code unit = 'e' +Subject length lower bound = 0 abXde 0: abXde diff --git a/testdata/testoutput22-8 b/testdata/testoutput22-8 index 7377f00..acb31d6 100644 --- a/testdata/testoutput22-8 +++ b/testdata/testoutput22-8 @@ -3,7 +3,13 @@ # of this test is different in 8-, 16-, and 32-bit modes. Some tests may match # in some widths and not in others. -/ab\Cde/utf +/ab\Cde/utf,info +Capturing subpattern count = 0 +Contains \C +Options: utf +First code unit = 'a' +Last code unit = 'e' +Subject length lower bound = 0 abXde 0: abXde diff --git a/testdata/testoutput5 b/testdata/testoutput5 index 80da58e..f19ad8c 100644 --- a/testdata/testoutput5 +++ b/testdata/testoutput5 @@ -4062,14 +4062,6 @@ No match abc\=zero_terminate 1: xyz -/abc\Cdef/info,utf -Capturing subpattern count = 0 -Contains \C -Options: utf -First code unit = 'a' -Last code unit = 'f' -Subject length lower bound = 0 - /a[[:punct:]b]/ucp,bincode ------------------------------------------------------------------ Bra