mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
fb82116f24
Replaced all imports of test-skeleton.c with support/test-driver.c. In some cases it was needed to adjust do_test to return int instead of static int since that is the method's signature expected by test-driver.c. Checked on x86_64. * string/test-string.h (TEST_FUNCTION): Use test_main instead of test_main (). (CMDLINE_PROCESS): Use function instead of defined macro. * debug/test-strcpy_chk.c: Import support/test-driver.c and also <suppport/support.h> to use set_fortify_handler(). * string/bug-envz1.c: Import support/test-driver.c instead of test-skeleton.c. * string/bug-strcoll2.c: Likewise. * string/bug-strtok1.c: Likewise. * string/stratcliff.c: Likewise. * string/test-ffs.c: Likewise. * string/test-memccpy.c: Likewise. * string/test-memchr.c: Likewise. * string/test-memcmp.c: Likewise. * string/test-memcpy.c: Likewise. * string/test-memmem.c: Likewise. * string/test-memmove.c: Likewise. * string/test-memrchr.c: Likewise. * string/test-memset.c: Likewise. * string/test-rawmemchr.c: Likewise. * string/test-strcasecmp.c: Likewise. * string/test-strcasestr.c: Likewise. * string/test-strcat.c: Likewise. * string/test-strchr.c: Likewise. * string/test-strcmp.c: Likewise. * string/test-strcpy.c: Likewise. * string/test-string.h: Likewise. * string/test-strlen.c: Likewise. * string/test-strncasecmp.c: Likewise. * string/test-strncat.c: Likewise. * string/test-strncmp.c: Likewise. * string/test-strncpy.c: Likewise. * string/test-strnlen.c: Likewise. * string/test-strpbrk.c: Likewise. * string/test-strrchr.c: Likewise. * string/test-strspn.c: Likewise. * string/test-strstr.c: Likewise. * string/tst-bswap.c: Likewise. * string/tst-cmp.c: Likewise. * string/tst-endian.c: Likewise. * string/tst-inlcall.c: Likewise. * string/tst-strcoll-overflow.c: Likewise. * string/tst-strfry.c: Likewise. * string/tst-strlen.c: Likewise. * string/tst-strtok.c: Likewise. * string/tst-strtok_r.c: Likewise. * string/tst-strxfrm.c: Likewise. * string/tst-strxfrm2.c: Likewise. * string/tst-svc.c: Likewise. * string/tst-svc2.c: Likewise.
76 lines
1.4 KiB
C
76 lines
1.4 KiB
C
/* Test for bug BZ #2703. */
|
|
#include <stdio.h>
|
|
#include <envz.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
static const struct
|
|
{
|
|
const char *s;
|
|
int in_result;
|
|
} strs[] =
|
|
{
|
|
{ "a=1", 1 },
|
|
{ "b=2", 1 },
|
|
{ "(*)", 0 },
|
|
{ "(*)", 0 },
|
|
{ "e=5", 1 },
|
|
{ "f=", 1 },
|
|
{ "(*)", 0 },
|
|
{ "h=8", 1 },
|
|
{ "i=9", 1 },
|
|
{ "j", 0 }
|
|
};
|
|
|
|
#define nstrs (sizeof (strs) / sizeof (strs[0]))
|
|
|
|
|
|
int
|
|
do_test (void)
|
|
{
|
|
|
|
size_t size = 0;
|
|
char *str = malloc (100);
|
|
if (str == NULL)
|
|
{
|
|
puts ("out of memory");
|
|
return 1;
|
|
}
|
|
|
|
char **argz = &str;
|
|
|
|
for (int i = 0; i < nstrs; ++i)
|
|
argz_add_sep (argz, &size, strs[i].s, '\0');
|
|
|
|
printf ("calling envz_strip with size=%zu\n", size);
|
|
envz_strip (argz, &size);
|
|
|
|
int result = 0;
|
|
printf ("new size=%zu\n", size);
|
|
for (int i = 0; i < nstrs; ++i)
|
|
if (strs[i].in_result)
|
|
{
|
|
char name[2];
|
|
name[0] = strs[i].s[0];
|
|
name[1] = '\0';
|
|
|
|
char *e = envz_entry (*argz, size, name);
|
|
if (e == NULL)
|
|
{
|
|
printf ("entry '%s' not found\n", name);
|
|
result = 1;
|
|
}
|
|
else if (strcmp (e, strs[i].s) != 0)
|
|
{
|
|
printf ("entry '%s' does not match: is '%s', expected '%s'\n",
|
|
name, e, strs[i].s);
|
|
result = 1;
|
|
}
|
|
}
|
|
|
|
free (*argz);
|
|
return result;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|