From 15c5f28bd2477b2676c4b85d59cd18ec897e8b7e Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Mon, 10 Apr 2017 03:24:07 +0000 Subject: [PATCH] tests: convert "inclib" test to new framework * testsuite/misc.pl (Tests): Add inclib. * testsuite/inclib.good: Delete file. * testsuite/inclib.inp: Likewise. * testsuite/inclib.sed: Likewise. * testsuite/local.mk (EXTRA_DIST): Remove their names. (SEDTESTS): Remove "inclib". --- testsuite/inclib.good | 34 -------------------- testsuite/inclib.inp | 34 -------------------- testsuite/inclib.sed | 2 -- testsuite/local.mk | 5 +-- testsuite/misc.pl | 74 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 74 deletions(-) delete mode 100644 testsuite/inclib.good delete mode 100644 testsuite/inclib.inp delete mode 100644 testsuite/inclib.sed diff --git a/testsuite/inclib.good b/testsuite/inclib.good deleted file mode 100644 index cb04b39..0000000 --- a/testsuite/inclib.good +++ /dev/null @@ -1,34 +0,0 @@ - /usr/X11R6/include - /usr/X11R5/include - /usr/X11R4/include - - /usr/include/X11R6 - /usr/include/X11R5 - /usr/include/X11R4 - - /usr/local/X11R6/include - /usr/local/X11R5/include - /usr/local/X11R4/include - - /usr/local/include/X11R6 - /usr/local/include/X11R5 - /usr/local/include/X11R4 - - /usr/X11/include - /usr/include/X11 - /usr/local/X11/include - /usr/local/include/X11 - - /usr/X386/include - /usr/x386/include - /usr/XFree86/include/X11 - - /usr/include - /usr/local/include - /usr/unsupported/include - /usr/athena/include - /usr/local/x11r5/include - /usr/lpp/Xamples/include - - /usr/openwin/include - /usr/openwin/share/include diff --git a/testsuite/inclib.inp b/testsuite/inclib.inp deleted file mode 100644 index 1f71277..0000000 --- a/testsuite/inclib.inp +++ /dev/null @@ -1,34 +0,0 @@ - /usr/X11R6/lib - /usr/X11R5/lib - /usr/X11R4/lib - - /usr/lib/X11R6 - /usr/lib/X11R5 - /usr/lib/X11R4 - - /usr/local/X11R6/lib - /usr/local/X11R5/lib - /usr/local/X11R4/lib - - /usr/local/lib/X11R6 - /usr/local/lib/X11R5 - /usr/local/lib/X11R4 - - /usr/X11/lib - /usr/lib/X11 - /usr/local/X11/lib - /usr/local/lib/X11 - - /usr/X386/lib - /usr/x386/lib - /usr/XFree86/lib/X11 - - /usr/lib - /usr/local/lib - /usr/unsupported/lib - /usr/athena/lib - /usr/local/x11r5/lib - /usr/lpp/Xamples/lib - - /usr/openwin/lib - /usr/openwin/share/lib diff --git a/testsuite/inclib.sed b/testsuite/inclib.sed deleted file mode 100644 index 528f158..0000000 --- a/testsuite/inclib.sed +++ /dev/null @@ -1,2 +0,0 @@ -# inspired by an autoconf generated configure script. -s;lib;include; diff --git a/testsuite/local.mk b/testsuite/local.mk index 30a6405..3ce3277 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -107,7 +107,7 @@ check_PROGRAMS += testsuite/bug-regex7 \ endif SEDTESTS += testsuite/sep \ - testsuite/inclib testsuite/8bit testsuite/newjis \ + testsuite/8bit testsuite/newjis \ testsuite/noeolw testsuite/modulo testsuite/numsub \ testsuite/numsub2 testsuite/numsub3 testsuite/numsub4 \ testsuite/numsub5 \ @@ -215,9 +215,6 @@ EXTRA_DIST += \ testsuite/eval.good \ testsuite/eval.inp \ testsuite/eval.sed \ - testsuite/inclib.good \ - testsuite/inclib.inp \ - testsuite/inclib.sed \ testsuite/khadafy.good \ testsuite/khadafy.inp \ testsuite/khadafy.sed \ diff --git a/testsuite/misc.pl b/testsuite/misc.pl index 9801bf8..db3eec7 100644 --- a/testsuite/misc.pl +++ b/testsuite/misc.pl @@ -437,6 +437,80 @@ y/b/a/ ], + ['inclib', + # inspired by an autoconf generated configure script. + qw(-e 's;lib;include;'), + {IN => " /usr/X11R6/lib\n" + . " /usr/X11R5/lib\n" + . " /usr/X11R4/lib\n" + . "\n" + . " /usr/lib/X11R6\n" + . " /usr/lib/X11R5\n" + . " /usr/lib/X11R4\n" + . "\n" + . " /usr/local/X11R6/lib\n" + . " /usr/local/X11R5/lib\n" + . " /usr/local/X11R4/lib\n" + . "\n" + . " /usr/local/lib/X11R6\n" + . " /usr/local/lib/X11R5\n" + . " /usr/local/lib/X11R4\n" + . "\n" + . " /usr/X11/lib\n" + . " /usr/lib/X11\n" + . " /usr/local/X11/lib\n" + . " /usr/local/lib/X11\n" + . "\n" + . " /usr/X386/lib\n" + . " /usr/x386/lib\n" + . " /usr/XFree86/lib/X11\n" + . "\n" + . " /usr/lib\n" + . " /usr/local/lib\n" + . " /usr/unsupported/lib\n" + . " /usr/athena/lib\n" + . " /usr/local/x11r5/lib\n" + . " /usr/lpp/Xamples/lib\n" + . "\n" + . " /usr/openwin/lib\n" + . " /usr/openwin/share/lib\n"}, + {OUT => " /usr/X11R6/include\n" + . " /usr/X11R5/include\n" + . " /usr/X11R4/include\n" + . "\n" + . " /usr/include/X11R6\n" + . " /usr/include/X11R5\n" + . " /usr/include/X11R4\n" + . "\n" + . " /usr/local/X11R6/include\n" + . " /usr/local/X11R5/include\n" + . " /usr/local/X11R4/include\n" + . "\n" + . " /usr/local/include/X11R6\n" + . " /usr/local/include/X11R5\n" + . " /usr/local/include/X11R4\n" + . "\n" + . " /usr/X11/include\n" + . " /usr/include/X11\n" + . " /usr/local/X11/include\n" + . " /usr/local/include/X11\n" + . "\n" + . " /usr/X386/include\n" + . " /usr/x386/include\n" + . " /usr/XFree86/include/X11\n" + . "\n" + . " /usr/include\n" + . " /usr/local/include\n" + . " /usr/unsupported/include\n" + . " /usr/athena/include\n" + . " /usr/local/x11r5/include\n" + . " /usr/lpp/Xamples/include\n" + . "\n" + . " /usr/openwin/include\n" + . " /usr/openwin/share/include\n"} + ], + + ['xabcx', # from the ChangeLog (Fri May 21 1993) # Regex address with custom character (\xREGEXx)