From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 130841 invoked by alias); 4 Oct 2018 11:13:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 130827 invoked by uid 89); 4 Oct 2018 11:13:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: =?ISO-8859-1?Q?No, score=-3.4 required=5.0 tests=AWL,BAYES_00,KHOP_DYNAMIC,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 spammy=now, 2018=c2, dj, be?= X-HELO: mx0a-001b2d01.pphosted.com Subject: Re: [PATCH] Adjust name-prefix of ld.so in test-container.c. To: "Carlos O'Donell" , DJ Delorie Cc: fweimer@redhat.com, libc-alpha@sourceware.org References: <2800fdf5-9e89-822b-70de-b7c176f5c2ae@redhat.com> From: Stefan Liebler Date: Thu, 04 Oct 2018 11:41:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <2800fdf5-9e89-822b-70de-b7c176f5c2ae@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit x-cbid: 18100411-0016-0000-0000-0000020E6820 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18100411-0017-0000-0000-00003265B34F Message-Id: <1a298987-c1d4-6e89-17d6-010abd977121@linux.ibm.com> X-SW-Source: 2018-10/txt/msg00066.txt.bz2 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  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 >> 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 Committed Thanks Stefan