From 53edb359afe31414cc49a197a83f3e3e6676dbac Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Mon, 10 Apr 2017 04:32:06 +0000 Subject: [PATCH] tests: convert "sep" test to new framework * testsuite/misc.pl (Tests): Add sep. * testsuite/sep.good: Delete file. * testsuite/sep.inp: Likewise. * testsuite/sep.sed: Likewise. * testsuite/local.mk (EXTRA_DIST): Remove their names. (SEDTESTS): Remove "sep". --- testsuite/local.mk | 6 +----- testsuite/misc.pl | 16 ++++++++++++++++ testsuite/sep.good | 3 --- testsuite/sep.inp | 3 --- testsuite/sep.sed | 4 ---- 5 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 testsuite/sep.good delete mode 100644 testsuite/sep.inp delete mode 100644 testsuite/sep.sed diff --git a/testsuite/local.mk b/testsuite/local.mk index 214abdf..ace6588 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -106,8 +106,7 @@ check_PROGRAMS += testsuite/bug-regex7 \ testsuite/runptests testsuite/tst-rxspencer testsuite/tst-regex2 endif -SEDTESTS += testsuite/sep \ - testsuite/8bit testsuite/newjis \ +SEDTESTS += testsuite/8bit testsuite/newjis \ testsuite/noeolw \ testsuite/madding testsuite/mac-mf \ testsuite/xemacs \ @@ -225,9 +224,6 @@ EXTRA_DIST += \ testsuite/noeolw.1good \ testsuite/noeolw.2good \ testsuite/noeolw.sed \ - testsuite/sep.good \ - testsuite/sep.inp \ - testsuite/sep.sed \ testsuite/subwrite.inp \ testsuite/subwrite.sed \ testsuite/subwrt1.good \ diff --git a/testsuite/misc.pl b/testsuite/misc.pl index 24258be..e41cb19 100644 --- a/testsuite/misc.pl +++ b/testsuite/misc.pl @@ -980,6 +980,22 @@ foo foo fo oo f oo foo foo foo foo foo foo foo foo foo foo foo foo foo ], + ['sep', + # inspired by an autoconf generated configure script. + qw(-f), + {IN => q(s%/[^/][^/]*$%% +s%[\/][^\/][^\/]*$%% +s,.*[^\/],, +)}, + {IN => "miss mary mack mack//mack/ran down/the track track track\n" + . "slashes\aren't%used enough/in/casual-conversation///\n" + . "possibly sentences would be more attractive if they ended" + . "in two slashes//\n"}, + {OUT => "\n" + . "///\n" + . "//\n"} + ], + ['xabcx', # from the ChangeLog (Fri May 21 1993) # Regex address with custom character (\xREGEXx) diff --git a/testsuite/sep.good b/testsuite/sep.good deleted file mode 100644 index 7db0e1e..0000000 --- a/testsuite/sep.good +++ /dev/null @@ -1,3 +0,0 @@ - -/// -// diff --git a/testsuite/sep.inp b/testsuite/sep.inp deleted file mode 100644 index 5795f4b..0000000 --- a/testsuite/sep.inp +++ /dev/null @@ -1,3 +0,0 @@ -miss mary mack mack//mack/ran down/the track track track -slashes\aren't%used enough/in/casual-conversation/// -possibly sentences would be more attractive if they ended in two slashes// diff --git a/testsuite/sep.sed b/testsuite/sep.sed deleted file mode 100644 index 4864b81..0000000 --- a/testsuite/sep.sed +++ /dev/null @@ -1,4 +0,0 @@ -# inspired by an autoconf generated configure script. -s%/[^/][^/]*$%% -s%[\/][^\/][^\/]*$%% -s,.*[^\/],,