From 628f37dba22cad1ddf1b6d83ddac4734f9f249aa Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Mon, 10 Apr 2017 04:04:26 +0000 Subject: [PATCH] tests: convert "numsub2" test to new framework * testsuite/misc.pl (Tests): Add numsub2. * testsuite/numsub2.good: Delete file. * testsuite/numsub2.inp: Likewise. * testsuite/numsub2.sed: Likewise. * testsuite/local.mk (EXTRA_DIST): Remove their names. (SEDTESTS): Remove "numsub2". --- testsuite/local.mk | 5 +---- testsuite/misc.pl | 7 +++++++ testsuite/numsub2.good | 0 testsuite/numsub2.inp | 1 - testsuite/numsub2.sed | 1 - 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 testsuite/numsub2.good delete mode 100644 testsuite/numsub2.inp delete mode 100644 testsuite/numsub2.sed diff --git a/testsuite/local.mk b/testsuite/local.mk index 4268f9e..0d73726 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -109,7 +109,7 @@ endif SEDTESTS += testsuite/sep \ testsuite/8bit testsuite/newjis \ testsuite/noeolw testsuite/numsub \ - testsuite/numsub2 testsuite/numsub3 testsuite/numsub4 \ + testsuite/numsub3 testsuite/numsub4 \ testsuite/numsub5 \ testsuite/madding testsuite/mac-mf \ testsuite/xemacs \ @@ -230,9 +230,6 @@ EXTRA_DIST += \ testsuite/numsub.good \ testsuite/numsub.inp \ testsuite/numsub.sed \ - testsuite/numsub2.good \ - testsuite/numsub2.inp \ - testsuite/numsub2.sed \ testsuite/numsub3.good \ testsuite/numsub3.inp \ testsuite/numsub3.sed \ diff --git a/testsuite/misc.pl b/testsuite/misc.pl index 7629f07..d388a96 100644 --- a/testsuite/misc.pl +++ b/testsuite/misc.pl @@ -891,6 +891,13 @@ s/$/Y/mg . "XcYY\n"} ], + ['numsub2', + qw(-n -e 's/a*/b/2'), + {IN => "\n"}, + {OUT => ""} + ], + + ['xabcx', # from the ChangeLog (Fri May 21 1993) # Regex address with custom character (\xREGEXx) diff --git a/testsuite/numsub2.good b/testsuite/numsub2.good deleted file mode 100644 index e69de29..0000000 diff --git a/testsuite/numsub2.inp b/testsuite/numsub2.inp deleted file mode 100644 index 8b13789..0000000 --- a/testsuite/numsub2.inp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/numsub2.sed b/testsuite/numsub2.sed deleted file mode 100644 index dddead9..0000000 --- a/testsuite/numsub2.sed +++ /dev/null @@ -1 +0,0 @@ -s/a*/b/2