GNU C Library master sources branch master updated. glibc-2.22-263-ge2b918d

[carlos at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  e2b918d05db58248d5a61427e9f1416ccce782c9 (commit)
      from  60084e34b63a9ad5bdd7381bab2d7bc30db106c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e2b918d05db58248d5a61427e9f1416ccce782c9

commit e2b918d05db58248d5a61427e9f1416ccce782c9
Author: Carlos O'Donell <carlos@systemhalted.org>
Date:   Fri Sep 18 10:27:55 2015 -0400

    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.

diff --git a/ChangeLog b/ChangeLog
index bb75382..22c17f5 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 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;
     }
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    3 +++
 elf/tst-dlmopen1.c |    7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources