mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
Include errno.h. Change main() to do_test(). Define TEST_FUNCTION. Include test-skeleton.c. (do_test): Check errno and exit(0) if ENOSYS.
This commit is contained in:
parent
43b9d65740
commit
d6220e9ee3
@ -68,7 +68,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
|
||||
tst-limits tst-rand48 bug-strtod tst-setcontext \
|
||||
test-a64l tst-qsort tst-system testmb2 bug-strtod2 \
|
||||
tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
|
||||
tst-makecontext
|
||||
tst-makecontext tst-strtod4
|
||||
|
||||
include ../Makeconfig
|
||||
|
||||
@ -114,6 +114,7 @@ test-canon-ARGS = --test-dir=${common-objpfx}stdlib
|
||||
|
||||
tst-strtod-ENV = LOCPATH=$(common-objpfx)localedata
|
||||
tst-strtod3-ENV = LOCPATH=$(common-objpfx)localedata
|
||||
tst-strtod4-ENV = LOCPATH=$(common-objpfx)localedata
|
||||
testmb2-ENV = LOCPATH=$(common-objpfx)localedata
|
||||
|
||||
# Run a test on the header files we use.
|
||||
|
@ -651,10 +651,11 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
|
||||
if (c != '0')
|
||||
{
|
||||
for (cnt = 0; thousands[cnt] != '\0'; ++cnt)
|
||||
if (c != thousands[cnt])
|
||||
if (thousands[cnt] != cp[cnt])
|
||||
break;
|
||||
if (thousands[cnt] != '\0')
|
||||
break;
|
||||
cp += cnt - 1;
|
||||
}
|
||||
c = *++cp;
|
||||
}
|
||||
@ -725,6 +726,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
|
||||
break;
|
||||
if (thousands[cnt] != '\0')
|
||||
break;
|
||||
cp += cnt - 1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2006, 2007 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
|
||||
@ -16,6 +16,7 @@
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <ucontext.h>
|
||||
@ -36,10 +37,16 @@ cf (int i)
|
||||
}
|
||||
|
||||
int
|
||||
main (void)
|
||||
do_test (void)
|
||||
{
|
||||
if (getcontext (&ucp) != 0)
|
||||
{
|
||||
if (errno == ENOSYS)
|
||||
{
|
||||
puts ("context handling not supported");
|
||||
return 0;
|
||||
}
|
||||
|
||||
puts ("getcontext failed");
|
||||
return 1;
|
||||
}
|
||||
@ -47,7 +54,7 @@ main (void)
|
||||
ucp.uc_link = NULL;
|
||||
ucp.uc_stack.ss_sp = st1;
|
||||
ucp.uc_stack.ss_size = sizeof st1;
|
||||
makecontext (&ucp, (void (*) ()) cf, 1, 78);
|
||||
makecontext (&ucp, (void (*) (void)) cf, 1, 78);
|
||||
if (setcontext (&ucp) != 0)
|
||||
{
|
||||
puts ("setcontext failed");
|
||||
@ -55,3 +62,6 @@ main (void)
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#include "../test-skeleton.c"
|
||||
|
56
stdlib/tst-strtod4.c
Normal file
56
stdlib/tst-strtod4.c
Normal file
@ -0,0 +1,56 @@
|
||||
#include <locale.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#define NBSP "\xc2\xa0"
|
||||
|
||||
static const struct
|
||||
{
|
||||
const char *in;
|
||||
const char *out;
|
||||
double expected;
|
||||
} tests[] =
|
||||
{
|
||||
{ "000"NBSP"000"NBSP"000", "", 0.0 },
|
||||
{ "1"NBSP"000"NBSP"000,5x", "x", 1000000.5 }
|
||||
};
|
||||
#define NTESTS (sizeof (tests) / sizeof (tests[0]))
|
||||
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
if (setlocale (LC_ALL, "cs_CZ.UTF-8") == NULL)
|
||||
{
|
||||
puts ("could not set locale");
|
||||
return 1;
|
||||
}
|
||||
|
||||
int status = 0;
|
||||
|
||||
for (int i = 0; i < NTESTS; ++i)
|
||||
{
|
||||
char *ep;
|
||||
double r = __strtod_internal (tests[i].in, &ep, 1);
|
||||
|
||||
if (strcmp (ep, tests[i].out) != 0)
|
||||
{
|
||||
printf ("%d: got rest string \"%s\", expected \"%s\"\n",
|
||||
i, ep, tests[i].out);
|
||||
status = 1;
|
||||
}
|
||||
|
||||
if (r != tests[i].expected)
|
||||
{
|
||||
printf ("%d: got wrong results %g, expected %g\n",
|
||||
i, r, tests[i].expected);
|
||||
status = 1;
|
||||
}
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#include "../test-skeleton.c"
|
Loading…
Reference in New Issue
Block a user