From patchwork Fri Jan 10 14:45:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 37286 Received: (qmail 100594 invoked by alias); 10 Jan 2020 14:45:54 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 100488 invoked by uid 89); 10 Jan 2020 14:45:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=arjun X-HELO: mx0a-001b2d01.pphosted.com Subject: Re: [PATCH v2] elf: Add tst-ldconfig-ld_so_conf-update test To: libc-alpha@sourceware.org References: <20191205172608.GA57577@aloka.lostca.se> <20191216143424.22882-1-ahajkova@redhat.com> <20200106180509.GA71028@aloka.lostca.se> <56533d16-d7d1-4e79-5a8f-ed4accb17247@gotplt.org> From: Stefan Liebler Date: Fri, 10 Jan 2020 15:45:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 In-Reply-To: <56533d16-d7d1-4e79-5a8f-ed4accb17247@gotplt.org> x-cbid: 20011014-0016-0000-0000-000002DC4275 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20011014-0017-0000-0000-0000333EC5A3 Message-Id: <357df77f-f709-8b35-b28d-e64f4524f92a@linux.ibm.com> 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 Reviewed-by: Siddhesh Poyarekar commit 7feda514bc62870cd3ac3413a2aebb810b346d02 Author: Stefan Liebler 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