From: Stefan Liebler <stli@linux.ibm.com>
To: "Carlos O'Donell" <carlos@redhat.com>, DJ Delorie <dj@redhat.com>
Cc: fweimer@redhat.com, libc-alpha@sourceware.org
Subject: Re: [PATCH] Adjust name-prefix of ld.so in test-container.c.
Date: Thu, 04 Oct 2018 11:41:00 -0000 [thread overview]
Message-ID: <1a298987-c1d4-6e89-17d6-010abd977121@linux.ibm.com> (raw)
In-Reply-To: <2800fdf5-9e89-822b-70de-b7c176f5c2ae@redhat.com>
On 09/17/2018 04:57 PM, Carlos O'Donell wrote:
> On 09/05/2018 05:14 AM, Stefan Liebler wrote:
>> On 09/04/2018 06:37 PM, DJ Delorie wrote:
>>>
>>> Stefan Liebler <stli@linux.ibm.com> writes:
>>>> +  if (strncmp (argv[1], support_objdir_elf_ldso,
>>>> +           strlen (support_objdir_elf_ldso)) == 0)
>>>
>>> If we're comparing the whole name now, this could be a strcmp() instead?
>>>
>> Yes, of course. You are right.
>> I've updated the patch.
>>
>> Thanks
>> Stefan
>>
>> 20180905_test_container.patch
>>
>>
>> commit 79f7c31ef02a13eb6ede1393770d29cb36914754
>> Author: Stefan Liebler <stli@linux.ibm.com>
>> Date: Wed Sep 5 09:23:13 2018 +0200
>>
>> Adjust name of ld.so in test-container.c.
>>
>> The test-container.c file assumes that ld.so is always named
>> something like /elf/ld-linux-*.
>> But e.g. on s390x it is named ld64.so.1 or ld.so.1 on s390.
>> There are other architectures like power or mips with similar names.
>>
>> This patch introduces the new global variable support_objdir_elf_ldso
>> which contains the absolute path to the runtime linker used by the
>> testsuite, e.g. OBJDIR_PATH/elf/ld-linux-x86-64.so.2.
>> The check in test-container.c is now comparing against this path.
>> Without this patch, test-container.c is searching invalid files / directories
>> and fails to find glibc/nss/tst-nss-test3.root/tst-nss-test3.script.
>> Then the test tst-nss-test3 fails!
>>
>> ChangeLog:
>>
>> * support/support.h (support_objdir_elf_ldso): New variable.
>> * support/support_paths.c (support_objdir_elf_ldso): Likewise.
>> * support/Makefile (CFLAGS-support_paths.c): Add definition
>> for OBJDIR_ELF_LDSO_PATH.
>> * support/test-container.c (main): Search for the ld.so
>> which is also used by the testsuite.
>
> OK for master.
>
> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Committed
Thanks
Stefan
prev parent reply other threads:[~2018-10-04 11:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 8:39 Stefan Liebler
2018-09-03 10:48 ` Florian Weimer
2018-09-03 14:13 ` Stefan Liebler
2018-09-04 16:38 ` DJ Delorie
2018-09-05 9:16 ` Stefan Liebler
2018-09-10 12:01 ` Stefan Liebler
2018-09-17 14:58 ` Carlos O'Donell
2018-10-04 11:41 ` Stefan Liebler [this message]
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=1a298987-c1d4-6e89-17d6-010abd977121@linux.ibm.com \
--to=stli@linux.ibm.com \
--cc=carlos@redhat.com \
--cc=dj@redhat.com \
--cc=fweimer@redhat.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).