From 042ea8ebe612e02a54107bb3ec6fab577d996a6e Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Mon, 10 Apr 2017 04:01:50 +0000 Subject: [PATCH] tests: convert "newline-anchor" test to new framework * testsuite/misc.pl (Tests): Add newline-anchor. * testsuite/newline-anchor.good: Delete file. * testsuite/newline-anchor.inp: Likewise. * testsuite/newline-anchor.sed: Likewise. * testsuite/local.mk (EXTRA_DIST): Remove their names. (SEDTESTS): Remove "newline-anchor". --- testsuite/local.mk | 6 +----- testsuite/misc.pl | 16 ++++++++++++++++ testsuite/newline-anchor.good | 3 --- testsuite/newline-anchor.inp | 3 --- testsuite/newline-anchor.sed | 6 ------ 5 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 testsuite/newline-anchor.good delete mode 100644 testsuite/newline-anchor.inp delete mode 100644 testsuite/newline-anchor.sed diff --git a/testsuite/local.mk b/testsuite/local.mk index 2b08998..4268f9e 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -123,8 +123,7 @@ SEDTESTS += testsuite/sep \ testsuite/badenc testsuite/inplace-hold testsuite/brackets \ testsuite/help testsuite/file \ testsuite/quiet testsuite/binary3 \ - testsuite/binary2 testsuite/binary testsuite/dc \ - testsuite/newline-anchor + testsuite/binary2 testsuite/binary testsuite/dc # Note that the first lines are statements. They ensure that environment # variables that can perturb tests are unset or set to expected values. @@ -223,9 +222,6 @@ EXTRA_DIST += \ testsuite/newjis.good \ testsuite/newjis.inp \ testsuite/newjis.sed \ - testsuite/newline-anchor.good \ - testsuite/newline-anchor.inp \ - testsuite/newline-anchor.sed \ testsuite/noeolw.good \ testsuite/noeolw.inp \ testsuite/noeolw.1good \ diff --git a/testsuite/misc.pl b/testsuite/misc.pl index c33dd27..7629f07 100644 --- a/testsuite/misc.pl +++ b/testsuite/misc.pl @@ -874,6 +874,22 @@ q( universe. You will never succeed. Everything will fail and come )} ], + ['newline-anchor', + qw(-f), + {IN => q(N +N +s/^/X/g +s/^/X/mg +s/$/Y/g +s/$/Y/mg +)}, + {IN => "a\n" + . "b\n" + . "c\n"}, + {OUT => "XXaY\n" + . "XbY\n" + . "XcYY\n"} + ], ['xabcx', # from the ChangeLog (Fri May 21 1993) diff --git a/testsuite/newline-anchor.good b/testsuite/newline-anchor.good deleted file mode 100644 index 5742735..0000000 --- a/testsuite/newline-anchor.good +++ /dev/null @@ -1,3 +0,0 @@ -XXaY -XbY -XcYY diff --git a/testsuite/newline-anchor.inp b/testsuite/newline-anchor.inp deleted file mode 100644 index de98044..0000000 --- a/testsuite/newline-anchor.inp +++ /dev/null @@ -1,3 +0,0 @@ -a -b -c diff --git a/testsuite/newline-anchor.sed b/testsuite/newline-anchor.sed deleted file mode 100644 index b3d2de1..0000000 --- a/testsuite/newline-anchor.sed +++ /dev/null @@ -1,6 +0,0 @@ -N -N -s/^/X/g -s/^/X/mg -s/$/Y/g -s/$/Y/mg