OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2002-09-28 Jakub Jelinek <jakub@redhat.com>

Browse Source 
* posix/bug-regex11.c (tests): Add flags field.
	(main): Avoid warnings.  Use test[i].flags.  Return nonzero
	if any of the tests failed.
	* posix/bug-regex12.c: New file.
	* posix/Makefile (tests): Add bug-regex12.
This commit is contained in:
Roland McGrath 2002-09-28 20:51:17 +00:00
parent 100a05053c
commit ab635ab254
3 changed files with 81 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
posix/Makefile
View File

@ -72,7 +72,7 @@ tests := tstgetopt testfnm runtests runptests \
tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \
bug-regex8 bug-regex9 bug-regex10 bug-regex11
bug-regex8 bug-regex9 bug-regex10 bug-regex11 bug-regex12
ifeq (yes,$(build-shared))
test-srcs := globtest
tests += wordexp-test tst-exec tst-spawn

16
posix/bug-regex11.c
View File

@ -24,19 +24,20 @@
#include <stdio.h>
#include <stdlib.h>
/* Tests supposed to match. */
struct
{
const char *pattern;
const char *string;
int nmatch;
int flags, nmatch;
regmatch_t rm[4];
} tests[] = {
/* Test for newline handling in regex. */
{ "[^~]*~", "\nx~y", 2, { { 0, 3 }, { -1, -1 } } },
{ "[^~]*~", "\nx~y", 0, 2, { { 0, 3 }, { -1, -1 } } },
/* Other tests. */
{ ".*|\\([KIO]\\)\\([^|]*\\).*|?[KIO]", "10~.~|P|K0|I10|O16|?KSb", 3,
{ ".*|\\([KIO]\\)\\([^|]*\\).*|?[KIO]", "10~.~|P|K0|I10|O16|?KSb", 0, 3,
{ { 0, 21 }, { 15, 16 }, { 16, 18 } } },
{ ".*|\\([KIO]\\)\\([^|]*\\).*|?\\1", "10~.~|P|K0|I10|O16|?KSb", 3,
{ ".*|\\([KIO]\\)\\([^|]*\\).*|?\\1", "10~.~|P|K0|I10|O16|?KSb", 0, 3,
{ { 0, 21 }, { 8, 9 }, { 9, 10 } } }
};
@ -45,13 +46,14 @@ main (void)
{
regex_t re;
regmatch_t rm[4];
int n, i, ret = 0;
size_t i;
int n, ret = 0;
mtrace ();
for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
{
n = regcomp (&re, tests[i].pattern, 0);
n = regcomp (&re, tests[i].pattern, tests[i].flags);
if (n != 0)
{
char buf[500];
@ -84,5 +86,5 @@ main (void)
regfree (&re);
}
return 0;
return ret;
}

71
posix/bug-regex12.c Normal file
View File

@ -0,0 +1,71 @@
/* Regular expression tests.
Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <sys/types.h>
#include <mcheck.h>
#include <regex.h>
#include <stdio.h>
#include <stdlib.h>
/* Tests supposed to not match. */
struct
{
const char *pattern;
const char *string;
int flags, nmatch;
} tests[] = {
{ "^<\\([^~]*\\)\\([^~]\\)[^~]*~\\1\\(.\\).*|=.*\\3.*\\2",
"<,.8~2,~so-|=-~.0,123456789<><", REG_NOSUB, 0, }
};
int
main (void)
{
regex_t re;
regmatch_t rm[4];
size_t i;
int n, ret = 0;
mtrace ();
for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
{
n = regcomp (&re, tests[i].pattern, tests[i].flags);
if (n != 0)
{
char buf[500];
regerror (n, &re, buf, sizeof (buf));
printf ("regcomp %d failed: %s\n", i, buf);
ret = 1;
continue;
}
if (! regexec (&re, tests[i].string, tests[i].nmatch,
tests[i].nmatch ? rm : NULL, 0))
{
printf ("regexec %d incorrectly matched\n", i);
ret = 1;
}
regfree (&re);
}
return ret;
}