qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

elf: Update DSO list, write audit log to elf/tst-audit23.out 

After commit 1d5024f4f0
("support: Build with exceptions and asynchronous unwind tables
[BZ #30587]"), libgcc_s is expected to show up in the DSO
list on 32-bit Arm.  Do not update max_objs because vdso is not
tracked (and which is the reason why the test currently passes
even with libgcc_s present).

Also write the log output from the auditor to standard output,
for easier test debugging.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2024-09-03 17:52:47 +02:00
parent ef5823d955
commit 4a50fdf8b2
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
elf/tst-audit23.c
View File

@ -85,13 +85,28 @@ do_test (int argc, char *argv[])
= support_capture_subprogram (spargv[0], spargv, NULL); = support_capture_subprogram (spargv[0], spargv, NULL);
support_capture_subprocess_check (&result, "tst-audit22", 0, sc_allow_stderr); support_capture_subprocess_check (&result, "tst-audit22", 0, sc_allow_stderr);
{
FILE *fp = fmemopen (result.err.buffer, result.err.length, "r");
TEST_VERIFY (fp != NULL);
unsigned int line = 0;
char *buffer = NULL;
size_t buffer_length = 0;
puts ("info: *** audit log start ***");
while (xgetline (&buffer, &buffer_length, fp))
printf ("%6u\t%s", ++line, buffer);
puts ("info: *** audit log end ***");
free (buffer);
xfclose (fp);
}
/* The expected la_objopen/la_objclose: /* The expected la_objopen/la_objclose:
1. executable 1. executable
2. loader 2. loader
3. libc.so 3. libc.so
4. tst-audit23mod.so 4. libgcc_s.so (one some architectures, for libsupport)
5. libc.so (LM_ID_NEWLM). 5. tst-audit23mod.so
6. vdso (optional and ignored). */ 6. libc.so (LM_ID_NEWLM).
vdso (optional and ignored). */
enum { max_objs = 6 }; enum { max_objs = 6 };
struct la_obj_t struct la_obj_t
{ {
@ -115,8 +130,10 @@ do_test (int argc, char *argv[])
TEST_VERIFY (out != NULL); TEST_VERIFY (out != NULL);
char *buffer = NULL; char *buffer = NULL;
size_t buffer_length = 0; size_t buffer_length = 0;
unsigned int line = 0;
while (xgetline (&buffer, &buffer_length, out)) while (xgetline (&buffer, &buffer_length, out))
{ {
++line;
if (startswith (buffer, "la_activity: ")) if (startswith (buffer, "la_activity: "))
{ {
uintptr_t cookie; uintptr_t cookie;
@ -174,8 +191,8 @@ do_test (int argc, char *argv[])
if (is_vdso (lname)) if (is_vdso (lname))
continue; continue;
if (nobjs == max_objs) if (nobjs == max_objs)
FAIL_EXIT1 ("non expected la_objopen: %s %"PRIxPTR" %ld", FAIL_EXIT1 ("(line %u) non expected la_objopen: %s %"PRIxPTR" %ld",
lname, laddr, lmid); line, lname, laddr, lmid);
objs[nobjs].lname = lname; objs[nobjs].lname = lname;
objs[nobjs].laddr = laddr; objs[nobjs].laddr = laddr;
objs[nobjs].lmid = lmid; objs[nobjs].lmid = lmid;