mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 20:40:05 +00:00
Fix error messages in elf/tst-dlmopen1.c.
The test error messages incorrectly reference LIBC_SO when they should reference the dlmopen'd library tst-dlmopen1mod.so. Define TEST_SO and use it in all the error messages.
This commit is contained in:
parent
60084e34b6
commit
e2b918d05d
@ -1,5 +1,8 @@
|
||||
2015-09-18 Carlos O'Donell <carlos@redhat.com>
|
||||
|
||||
* elf/tst-dlmopen1.c: Define TEST_SO.
|
||||
(do_test): Use TEST_SO.
|
||||
|
||||
* elf/dl-load.c: Include libc-internal.h.
|
||||
(_dl_map_object_from_fd): Use ALIGN_UP and ALIGN_DOWN.
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
#include <stdio.h>
|
||||
#include <gnu/lib-names.h>
|
||||
|
||||
#define TEST_SO "$ORIGIN/tst-dlmopen1mod.so"
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
@ -34,7 +35,7 @@ do_test (void)
|
||||
return 1;
|
||||
}
|
||||
|
||||
h = dlmopen (LM_ID_NEWLM, "$ORIGIN/tst-dlmopen1mod.so", RTLD_LAZY);
|
||||
h = dlmopen (LM_ID_NEWLM, TEST_SO, RTLD_LAZY);
|
||||
if (h == NULL)
|
||||
{
|
||||
printf ("cannot get handle for %s: %s\n",
|
||||
@ -52,7 +53,7 @@ do_test (void)
|
||||
|
||||
if (ns == LM_ID_BASE)
|
||||
{
|
||||
printf ("namespace for %s is LM_ID_BASE\n", LIBC_SO);
|
||||
printf ("namespace for %s is LM_ID_BASE\n", TEST_SO);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -69,7 +70,7 @@ do_test (void)
|
||||
if (dlclose (h) != 0)
|
||||
{
|
||||
printf ("dlclose for %s in %s failed: %s\n",
|
||||
LIBC_SO, __func__, dlerror ());
|
||||
TEST_SO, __func__, dlerror ());
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user