mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00: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.
92 lines
2.4 KiB
C
92 lines
2.4 KiB
C
/* Bug 18589: sort-test.sh fails at random.
|
|
Copyright (C) 2015-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <locale.h>
|
|
|
|
/* An incorrect strcoll optimization resulted in incorrect
|
|
results from strcoll for cs_CZ and da_DK. */
|
|
|
|
int
|
|
test_cs_CZ (void)
|
|
{
|
|
const char t1[] = "config";
|
|
const char t2[] = "choose";
|
|
if (setlocale (LC_ALL, "cs_CZ.UTF-8") == NULL)
|
|
{
|
|
perror ("setlocale");
|
|
return 1;
|
|
}
|
|
/* In Czech the digraph ch sorts after c, therefore we expect
|
|
config to sort before choose. */
|
|
int a = strcoll (t1, t2);
|
|
int b = strcoll (t2, t1);
|
|
printf ("strcoll (\"%s\", \"%s\") = %d\n", t1, t2, a);
|
|
printf ("strcoll (\"%s\", \"%s\") = %d\n", t2, t1, b);
|
|
if (a < 0 && b > 0)
|
|
{
|
|
puts ("PASS: config < choose");
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
puts ("FAIL: Wrong sorting in cs_CZ.UTF-8.");
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
int
|
|
test_da_DK (void)
|
|
{
|
|
const char t1[] = "AS";
|
|
const char t2[] = "AA";
|
|
if (setlocale (LC_ALL, "da_DK.ISO-8859-1") == NULL)
|
|
{
|
|
perror ("setlocale");
|
|
return 1;
|
|
}
|
|
/* AA should be treated as the last letter of the Danish alphabet,
|
|
hence sorting after AS. */
|
|
int a = strcoll (t1, t2);
|
|
int b = strcoll (t2, t1);
|
|
printf ("strcoll (\"%s\", \"%s\") = %d\n", t1, t2, a);
|
|
printf ("strcoll (\"%s\", \"%s\") = %d\n", t2, t1, b);
|
|
if (a < 0 && b > 0)
|
|
{
|
|
puts ("PASS: AS < AA");
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
puts ("FAIL: Wrong sorting in da_DK.ISO-8859-1");
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
int
|
|
do_test (void)
|
|
{
|
|
int err = 0;
|
|
err |= test_cs_CZ ();
|
|
err |= test_da_DK ();
|
|
return err;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|