From: Stefan Liebler <stli@linux.ibm.com>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH v2] elf: Add tst-ldconfig-ld_so_conf-update test
Date: Fri, 10 Jan 2020 14:45:00 -0000 [thread overview]
Message-ID: <357df77f-f709-8b35-b28d-e64f4524f92a@linux.ibm.com> (raw)
In-Reply-To: <56533d16-d7d1-4e79-5a8f-ed4accb17247@gotplt.org>
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
On 1/7/20 5:20 AM, Siddhesh Poyarekar wrote:
> On 06/01/20 11:39 pm, Adhemerval Zanella wrote:
>>
>>
>> On 06/01/2020 15:05, Arjun Shankar wrote:
>>> + Copyright (C) 2019 Free Software Foundation, Inc.
>>> + This file is part of the GNU C Library.
>>
>> It needs to update the copyright year to 2020
>>
>>>
>>> This version looks good to me and I'd say it's good enough for master.
>>
>> And to not add any confusion, only once 2.32 master open or if
>> release manager (Siddhesh) agrees.
>>
>
> This is OK for master.
>
> Thanks,
> Siddhesh
>
Hi,
If run on 32bit, this test fails while renaming tst-ldconfig-ld-mod.so
as there is no /usr/lib64 directory.
The attached patch is constructing the file name with help of
support_libdir_prefix.
If the patch is okay, let me know if I can commit it on master.
Bye,
Stefan
[-- Attachment #2: 20200110_tst-ldconfig-ld_so_conf-update.patch --]
[-- Type: text/x-patch, Size: 1390 bytes --]
commit 7feda514bc62870cd3ac3413a2aebb810b346d02
Author: Stefan Liebler <stli@linux.ibm.com>
Date: Fri Jan 10 15:36:52 2020 +0100
Fix "elf: Add tst-ldconfig-ld_so_conf-update test" on 32bit.
This new test was introduced with recent commit
591236f1a33f11cc65ccf009d997071ba853e186.
If run on 32bit, it fails while renaming tst-ldconfig-ld-mod.so as there is no
/usr/lib64 directory. This patch is constructing the file name with help of
support_libdir_prefix.
diff --git a/elf/tst-ldconfig-ld_so_conf-update.c b/elf/tst-ldconfig-ld_so_conf-update.c
index 54fae5c829..ff2ee217d9 100644
--- a/elf/tst-ldconfig-ld_so_conf-update.c
+++ b/elf/tst-ldconfig-ld_so_conf-update.c
@@ -71,9 +71,11 @@ do_test (void)
/* Rename the DSO to start with "lib" because there's an undocumented
filter in ldconfig where it ignores any file that doesn't start with
"lib" (for regular shared libraries) or "ld-" (for ld-linux-*). */
- if (rename ("/usr/lib64/tst-ldconfig-ld-mod.so",
- "/tmp/tst-ldconfig/libldconfig-ld-mod.so"))
+ char *mod_src_path = xasprintf ("%s/tst-ldconfig-ld-mod.so",
+ support_libdir_prefix);
+ if (rename (mod_src_path, "/tmp/tst-ldconfig/libldconfig-ld-mod.so"))
FAIL_EXIT1 ("Renaming/moving the DSO failed: %m");
+ free (mod_src_path);
/* Open the DSO. We expect this to fail - tst-ldconfig directory
next prev parent reply other threads:[~2020-01-10 14:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 9:56 [PATCH] " Alexandra Hájková
2019-12-05 17:31 ` Arjun Shankar
2019-12-16 14:34 ` [PATCH v2] " Alexandra Hájková
2020-01-06 18:05 ` Arjun Shankar
2020-01-06 18:09 ` Adhemerval Zanella
2020-01-07 4:20 ` Siddhesh Poyarekar
2020-01-10 14:45 ` Stefan Liebler [this message]
2020-01-10 16:00 ` Siddhesh Poyarekar
2020-01-13 10:09 ` Stefan Liebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=357df77f-f709-8b35-b28d-e64f4524f92a@linux.ibm.com \
--to=stli@linux.ibm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).