picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support run bug-setlocale1 directly

This commit is contained in:
H.J. Lu 2013-01-10 14:15:49 -08:00
parent 4cf8f2098f
commit c34521ceac
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,5 +1,14 @@
2013-01-10 H.J. Lu <hongjiu.lu@intel.com>
* Makefile (tests-static): New variable.
(tests): Add $(tests-static).
(bug-setlocale1-ARGS): Set to -- $(built-program-cmd).
(bug-setlocale1-static-ENV): New variable.
(bug-setlocale1-static-ARGS): Likewise.
* bug-setlocale1.c (do_test): Support run directly. Check env[1]
instead of newargv[0].
* bug-setlocale1-static.c: New file.
* posix/Makefile (tests-static): New variable.
(tests): Add $(tests-static).
(tst-exec-static-ARGS): New variable.

6
localedata/Makefile
View File

@ -78,6 +78,8 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
tst-strfmon1 tst-sscanf bug-setlocale1 tst-setlocale2
tests-static = bug-setlocale1-static
tests += $(tests-static)
ifeq (yes,$(build-shared))
ifneq (no,$(PERL))
tests: $(objpfx)mtrace-tst-leaks
@ -285,7 +287,9 @@ $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
bug-setlocale1-ENV = LOCPATH=$(common-objpfx)localedata
bug-setlocale1-ARGS = $(common-objpfx)
bug-setlocale1-ARGS = -- $(built-program-cmd)
bug-setlocale1-static-ENV = $(bug-setlocale1-ENV)
bug-setlocale1-static-ARGS = $(bug-setlocale1-ARGS)
tst-setlocale2-ENV = LOCPATH=$(common-objpfx)localedata
$(objdir)/iconvdata/gconv-modules:

1
localedata/bug-setlocale1-static.c Normal file
View File

@ -0,0 +1 @@
#include "bug-setlocale1.c"

18
localedata/bug-setlocale1.c
View File

@ -12,16 +12,16 @@ do_test (int argc, char *argv[])
if (argc > 1)
{
char *newargv[5];
asprintf (&newargv[0], "%self/ld.so", argv[1]);
if (newargv[0] == NULL)
int i;
if (argc != 2 && argc != 5)
{
puts ("asprintf failed");
printf ("wrong number of arguments (%d)\n", argc);
return 1;
}
newargv[1] = (char *) "--library-path";
newargv[2] = argv[1];
newargv[3] = argv[0];
newargv[4] = NULL;
for (i = 0; i < (argc == 5 ? 4 : 1); i++)
newargv[i] = argv[i + 1];
newargv[i] = NULL;
char *env[3];
env[0] = (char *) "LC_CTYPE=de_DE.UTF-8";
@ -32,9 +32,9 @@ do_test (int argc, char *argv[])
return 1;
}
asprintf (&env[1], "LOCPATH=%s", loc);
if (newargv[0] == NULL)
if (env[1] == NULL)
{
puts ("second asprintf failed");
puts ("asprintf failed");
return 1;
}
env[2] = NULL;