diff options
| author | Carlos O'Donell <carlos@systemhalted.org> | 2015-09-18 10:27:55 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2015-09-18 10:27:55 -0400 |
| commit | e2b918d05db58248d5a61427e9f1416ccce782c9 (patch) | |
| tree | 153bba6912681caf1eca30e403109dd1d45faf53 | |
| parent | 60084e34b63a9ad5bdd7381bab2d7bc30db106c9 (diff) | |
| download | glibc-e2b918d05db58248d5a61427e9f1416ccce782c9.tar.gz glibc-e2b918d05db58248d5a61427e9f1416ccce782c9.tar.xz glibc-e2b918d05db58248d5a61427e9f1416ccce782c9.zip | |
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.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | elf/tst-dlmopen1.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index bb75382409..22c17f5bde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/elf/tst-dlmopen1.c b/elf/tst-dlmopen1.c index 9839267d8f..5a05891846 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; } |