From 53fc70ba8915ad2f19c41c8fe9e9cd3ecf1ee5c9 Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Mon, 10 Apr 2017 03:38:40 +0000 Subject: [PATCH] tests: convert "linecnt" test to new framework * testsuite/misc.pl (Tests): Add linecnt. * testsuite/linecnt.good: Delete file. * testsuite/linecnt.inp: Likewise. * testsuite/linecnt.sed: Likewise. * testsuite/local.mk (EXTRA_DIST): Remove their names. (SEDTESTS): Remove "linecnt". --- testsuite/linecnt.good | 110 --------------------------- testsuite/linecnt.inp | 55 -------------- testsuite/linecnt.sed | 1 - testsuite/local.mk | 5 +- testsuite/misc.pl | 169 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 170 insertions(+), 170 deletions(-) delete mode 100644 testsuite/linecnt.good delete mode 100644 testsuite/linecnt.inp delete mode 100644 testsuite/linecnt.sed diff --git a/testsuite/linecnt.good b/testsuite/linecnt.good deleted file mode 100644 index 0488b62..0000000 --- a/testsuite/linecnt.good +++ /dev/null @@ -1,110 +0,0 @@ -1 -A dialogue on poverty -2 - -3 - On the night when the rain beats, -4 - Driven by the wind, -5 - On the night when the snowflakes mingle -6 - With a sleety rain, -7 - I feel so helplessly cold. -8 - I nibble at a lump of salt, -9 - Sip the hot, oft-diluted dregs of _sake_; -10 - And coughing, snuffling, -11 - And stroking my scanty beard, -12 - I say in my pride, -13 - "There's none worthy, save I!" -14 - But I shiver still with cold. -15 - I pull up my hempen bedclothes, -16 - Wear what few sleeveless clothes I have, -17 - But cold and bitter is the night! -18 - As for those poorer than myself, -19 - Their parents must be cold and hungry, -20 - Their wives and children beg and cry. -21 - Then, how do you struggle through life? -22 - -23 - Wide as they call the heaven and earth, -24 - For me they have shrunk quite small; -25 - Bright though they call the sun and moon, -26 - They never shine for me. -27 - Is it the same with all men, -28 - Or for me alone? -29 - By rare chance I was born a man -30 - And no meaner than my fellows, -31 - But, wearing unwadded sleeveless clothes -32 - In tatters, like weeds waving in the sea, -33 - Hanging from my shoulders, -34 - And under the sunken roof, -35 - Within the leaning walls, -36 - Here I lie on straw -37 - Spread on bare earth, -38 - With my parents at my pillow, -39 - And my wife and children at my feet, -40 - All huddled in grief and tears. -41 - No fire sends up smoke -42 - At the cooking-place, -43 - And in the cauldron -44 - A spider spins its web. -45 - With not a grain to cook, -46 - We moan like the night thrush. -47 - Then, "to cut," as the saying is, -48 - "The ends of what is already too short," -49 - The village headman comes, -50 - With rod in hand, to our sleeping place, -51 - Growling for his dues. -52 - Must it be so hopeless -- -53 - The way of this world? -54 - -55 - -- Yamanoue Okura diff --git a/testsuite/linecnt.inp b/testsuite/linecnt.inp deleted file mode 100644 index a34df29..0000000 --- a/testsuite/linecnt.inp +++ /dev/null @@ -1,55 +0,0 @@ -A dialogue on poverty - - On the night when the rain beats, - Driven by the wind, - On the night when the snowflakes mingle - With a sleety rain, - I feel so helplessly cold. - I nibble at a lump of salt, - Sip the hot, oft-diluted dregs of _sake_; - And coughing, snuffling, - And stroking my scanty beard, - I say in my pride, - "There's none worthy, save I!" - But I shiver still with cold. - I pull up my hempen bedclothes, - Wear what few sleeveless clothes I have, - But cold and bitter is the night! - As for those poorer than myself, - Their parents must be cold and hungry, - Their wives and children beg and cry. - Then, how do you struggle through life? - - Wide as they call the heaven and earth, - For me they have shrunk quite small; - Bright though they call the sun and moon, - They never shine for me. - Is it the same with all men, - Or for me alone? - By rare chance I was born a man - And no meaner than my fellows, - But, wearing unwadded sleeveless clothes - In tatters, like weeds waving in the sea, - Hanging from my shoulders, - And under the sunken roof, - Within the leaning walls, - Here I lie on straw - Spread on bare earth, - With my parents at my pillow, - And my wife and children at my feet, - All huddled in grief and tears. - No fire sends up smoke - At the cooking-place, - And in the cauldron - A spider spins its web. - With not a grain to cook, - We moan like the night thrush. - Then, "to cut," as the saying is, - "The ends of what is already too short," - The village headman comes, - With rod in hand, to our sleeping place, - Growling for his dues. - Must it be so hopeless -- - The way of this world? - - -- Yamanoue Okura diff --git a/testsuite/linecnt.sed b/testsuite/linecnt.sed deleted file mode 100644 index 3134d36..0000000 --- a/testsuite/linecnt.sed +++ /dev/null @@ -1 +0,0 @@ -= diff --git a/testsuite/local.mk b/testsuite/local.mk index ddaee54..89d48e7 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -114,7 +114,7 @@ SEDTESTS += testsuite/sep \ testsuite/madding testsuite/mac-mf \ testsuite/xemacs \ testsuite/uniq testsuite/manis \ - testsuite/linecnt testsuite/eval \ + testsuite/eval \ testsuite/distrib testsuite/8to7 \ testsuite/middle \ testsuite/bsd testsuite/stdin \ @@ -215,9 +215,6 @@ EXTRA_DIST += \ testsuite/eval.good \ testsuite/eval.inp \ testsuite/eval.sed \ - testsuite/linecnt.good \ - testsuite/linecnt.inp \ - testsuite/linecnt.sed \ testsuite/mac-mf.good \ testsuite/mac-mf.inp \ testsuite/mac-mf.sed \ diff --git a/testsuite/misc.pl b/testsuite/misc.pl index 7e97c59..b1d9f11 100644 --- a/testsuite/misc.pl +++ b/testsuite/misc.pl @@ -583,6 +583,175 @@ y/b/a/ . "32) Mulazim Awwal Mu'ammar Muhammad Abu Minyar al-Qadhafi\n"} ], + ['linecnt', + qw(-e '='), + {IN => "A dialogue on poverty\n" + . "\n" + . " On the night when the rain beats,\n" + . " Driven by the wind,\n" + . " On the night when the snowflakes mingle\n" + . " With a sleety rain,\n" + . " I feel so helplessly cold.\n" + . " I nibble at a lump of salt,\n" + . " Sip the hot, oft-diluted dregs of _sake_;\n" + . " And coughing, snuffling,\n" + . " And stroking my scanty beard,\n" + . " I say in my pride,\n" + . " \"There's none worthy, save I!\"\n" + . " But I shiver still with cold.\n" + . " I pull up my hempen bedclothes,\n" + . " Wear what few sleeveless clothes I have,\n" + . " But cold and bitter is the night!\n" + . " As for those poorer than myself,\n" + . " Their parents must be cold and hungry,\n" + . " Their wives and children beg and cry.\n" + . " Then, how do you struggle through life?\n" + . "\n" + . " Wide as they call the heaven and earth,\n" + . " For me they have shrunk quite small;\n" + . " Bright though they call the sun and moon,\n" + . " They never shine for me.\n" + . " Is it the same with all men,\n" + . " Or for me alone?\n" + . " By rare chance I was born a man\n" + . " And no meaner than my fellows,\n" + . " But, wearing unwadded sleeveless clothes\n" + . " In tatters, like weeds waving in the sea,\n" + . " Hanging from my shoulders,\n" + . " And under the sunken roof,\n" + . " Within the leaning walls,\n" + . " Here I lie on straw\n" + . " Spread on bare earth,\n" + . " With my parents at my pillow,\n" + . " And my wife and children at my feet,\n" + . " All huddled in grief and tears.\n" + . " No fire sends up smoke\n" + . " At the cooking-place,\n" + . " And in the cauldron\n" + . " A spider spins its web.\n" + . " With not a grain to cook,\n" + . " We moan like the night thrush.\n" + . " Then, \"to cut,\" as the saying is,\n" + . " \"The ends of what is already too short,\"\n" + . " The village headman comes,\n" + . " With rod in hand, to our sleeping place,\n" + . " Growling for his dues.\n" + . " Must it be so hopeless --\n" + . " The way of this world?\n" + . "\n" + . " -- Yamanoue Okura\n"}, + {OUT => "1\n" + . "A dialogue on poverty\n" + . "2\n" + . "\n" + . "3\n" + . " On the night when the rain beats,\n" + . "4\n" + . " Driven by the wind,\n" + . "5\n" + . " On the night when the snowflakes mingle\n" + . "6\n" + . " With a sleety rain,\n" + . "7\n" + . " I feel so helplessly cold.\n" + . "8\n" + . " I nibble at a lump of salt,\n" + . "9\n" + . " Sip the hot, oft-diluted dregs of _sake_;\n" + . "10\n" + . " And coughing, snuffling,\n" + . "11\n" + . " And stroking my scanty beard,\n" + . "12\n" + . " I say in my pride,\n" + . "13\n" + . " \"There's none worthy, save I!\"\n" + . "14\n" + . " But I shiver still with cold.\n" + . "15\n" + . " I pull up my hempen bedclothes,\n" + . "16\n" + . " Wear what few sleeveless clothes I have,\n" + . "17\n" + . " But cold and bitter is the night!\n" + . "18\n" + . " As for those poorer than myself,\n" + . "19\n" + . " Their parents must be cold and hungry,\n" + . "20\n" + . " Their wives and children beg and cry.\n" + . "21\n" + . " Then, how do you struggle through life?\n" + . "22\n" + . "\n" + . "23\n" + . " Wide as they call the heaven and earth,\n" + . "24\n" + . " For me they have shrunk quite small;\n" + . "25\n" + . " Bright though they call the sun and moon,\n" + . "26\n" + . " They never shine for me.\n" + . "27\n" + . " Is it the same with all men,\n" + . "28\n" + . " Or for me alone?\n" + . "29\n" + . " By rare chance I was born a man\n" + . "30\n" + . " And no meaner than my fellows,\n" + . "31\n" + . " But, wearing unwadded sleeveless clothes\n" + . "32\n" + . " In tatters, like weeds waving in the sea,\n" + . "33\n" + . " Hanging from my shoulders,\n" + . "34\n" + . " And under the sunken roof,\n" + . "35\n" + . " Within the leaning walls,\n" + . "36\n" + . " Here I lie on straw\n" + . "37\n" + . " Spread on bare earth,\n" + . "38\n" + . " With my parents at my pillow,\n" + . "39\n" + . " And my wife and children at my feet,\n" + . "40\n" + . " All huddled in grief and tears.\n" + . "41\n" + . " No fire sends up smoke\n" + . "42\n" + . " At the cooking-place,\n" + . "43\n" + . " And in the cauldron\n" + . "44\n" + . " A spider spins its web.\n" + . "45\n" + . " With not a grain to cook,\n" + . "46\n" + . " We moan like the night thrush.\n" + . "47\n" + . " Then, \"to cut,\" as the saying is,\n" + . "48\n" + . " \"The ends of what is already too short,\"\n" + . "49\n" + . " The village headman comes,\n" + . "50\n" + . " With rod in hand, to our sleeping place,\n" + . "51\n" + . " Growling for his dues.\n" + . "52\n" + . " Must it be so hopeless --\n" + . "53\n" + . " The way of this world?\n" + . "54\n" + . "\n" + . "55\n" + . " -- Yamanoue Okura\n"} + ], + ['xabcx', # from the ChangeLog (Fri May 21 1993)