From patchwork Mon Sep 3 08:39:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 29163 Received: (qmail 4774 invoked by alias); 3 Sep 2018 08:39: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 4758 invoked by uid 89); 3 Sep 2018 08:39:54 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.6 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.2 spammy=Hx-languages-length:1898, strlen, strncmp X-HELO: mx0a-001b2d01.pphosted.com To: GNU C Library From: Stefan Liebler Subject: [PATCH] Adjust name-prefix of ld.so in test-container.c. Date: Mon, 3 Sep 2018 10:39:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 x-cbid: 18090308-0012-0000-0000-000002A2C866 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18090308-0013-0000-0000-000020D6DCFB Message-Id: <0a6087d9-08a2-d157-163f-25697e9e35e2@linux.ibm.com> Hi, 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 just changes the assumption to /elf/ld*. 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! Bye Stefan ChangeLog: * support/test-container.c (main): Just search for /elf/ld as ld.so in not names ld-linux* on all architectures. commit 875af26b6e3a1ffd8bccc35e4a596853232bfb3c Author: Stefan Liebler Date: Fri Aug 31 14:44:23 2018 +0200 Adjust name-prefix 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 just changes the assumption to /elf/ld*. 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/test-container.c (main): Just search for /elf/ld as ld.so in not names ld-linux* on all architectures. diff --git a/support/test-container.c b/support/test-container.c index 2e91bdf9ec..8f7c3b076b 100644 --- a/support/test-container.c +++ b/support/test-container.c @@ -675,8 +675,8 @@ main (int argc, char **argv) } } - if (strncmp (argv[1], concat (support_objdir_root, "/elf/ld-linux-", NULL), - strlen (support_objdir_root) + 14) == 0) + if (strncmp (argv[1], concat (support_objdir_root, "/elf/ld", NULL), + strlen (support_objdir_root) + 7) == 0) { ++argv; --argc;