This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] Fix elf/tst-dlmopen1.c error messages.
- From: "Carlos O'Donell" <carlos at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Fri, 18 Sep 2015 10:27:43 -0400
- Subject: [COMMITTED] Fix elf/tst-dlmopen1.c error messages.
- Authentication-results: sourceware.org; auth=none
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.
Committed.
2015-09-18 Carlos O'Donell <carlos@redhat.com>
* elf/tst-dlmopen1.c: Define TEST_SO.
(do_test): Use TEST_SO.
diff --git a/elf/tst-dlmopen1.c b/elf/tst-dlmopen1.c
index 9839267..5a05891 100644
--- a/elf/tst-dlmopen1.c
+++ b/elf/tst-dlmopen1.c
@@ -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;
}
---
Cheers,
Carlos.