| Message ID | 20210226211507.3430032-1-hjl.tools@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Carlos O'Donell |
| Headers |
Return-Path: <libc-alpha-bounces@sourceware.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB5E6398D04C; Fri, 26 Feb 2021 21:15:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB5E6398D04C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614374114; bh=K3mAnSFWOTfBpyTYmvUakmmVB0VfPYrsjUPXZcfpbac=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Bsj1ZEEC5QIOzTs70YeAl3Izvl6DfULdIT9lnhoKbb8TP39noyO7k4aAc9EyaR3vX wbmg9xE5ziMvMHf3Jl4K00srnyK7+I5zukOyV4ejgUNfNY9rrwswCrCoHzpR/XHhEA kRVB6HGq7FC/4EoPUjTcMS0Df+H+1AO9AlET2Il4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id CFB8E398B8B1 for <libc-alpha@sourceware.org>; Fri, 26 Feb 2021 21:15:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CFB8E398B8B1 Received: by mail-pf1-x42b.google.com with SMTP id d12so4550719pfo.7 for <libc-alpha@sourceware.org>; Fri, 26 Feb 2021 13:15:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K3mAnSFWOTfBpyTYmvUakmmVB0VfPYrsjUPXZcfpbac=; b=DxVBrc56rtIB/SaGYCmStdcgxsF7sJWTAWiifjqFnruiKrpTn4iVikJ03JEnE6CJjQ osskhHXPvigmMoBDJYjqq5evo8APkb877AJj4w1Gev6vUAoJkYvaXERo7l4qcPL6U98X G18N7R6FjsmS7aJ/yEyW5PjFxTkZwU8wld58/XFFz39yAF/sfTLciB5upXTtDRznJzQR Y/P171+/sWPjb5KhV0hBNt9MAjC+YCtYriQDG0EICAaToA3HuiadtupllOHmPZCwSD8Z QtLYCKo3nT30y00sXn2bipnGNUgivtsIs1J+qSw1khkkVBxE4wXTsMrSILe9GAVxM/16 0Axg== X-Gm-Message-State: AOAM532V8gShWHvqvNY4GaIf7nW3xtMi66L4o59W9VZbxf5F51BtWqXo 9tVGp22lGTSwzVJuwEPZ7/Vd1ryvnuo= X-Google-Smtp-Source: ABdhPJyBPucvcbPb7zOLC+/IuDjvx23grAQ0lBbaLMg4pCVCJ/BRAfOBXu6jptnFqTbJaBZyCB+vkw== X-Received: by 2002:a63:214e:: with SMTP id s14mr4535336pgm.101.1614374110827; Fri, 26 Feb 2021 13:15:10 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.56.38.48]) by smtp.gmail.com with ESMTPSA id r4sm9298311pjl.15.2021.02.26.13.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 13:15:10 -0800 (PST) Received: from gnu-cfl-2.?040none?041 (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 1C0321A0108; Fri, 26 Feb 2021 13:15:08 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] Run $(objpfx)iconvconfig as an installed program Date: Fri, 26 Feb 2021 13:15:07 -0800 Message-Id: <20210226211507.3430032-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3035.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org> Reply-To: "H.J. Lu" <hjl.tools@gmail.com> Cc: Florian Weimer <fweimer@redhat.com> Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org> |
| Series |
Run $(objpfx)iconvconfig as an installed program
|
|
Commit Message
H.J. Lu
Feb. 26, 2021, 9:15 p.m. UTC
When glibc is configured with --enable-hardcoded-path-in-tests, "make xcheck" failed with ... env GCONV_PATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconvdata LOCPATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/localedata LC_ALL=C /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig --output=$tmp --nostdlib /usr/lib64/gconv; ... /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig: /lib64/libc.so.6: version `GLIBC_2.34' not found (required by /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig) ... FAIL: iconv/test-iconvconfig Since $(objpfx)iconvconfig is an installed program, run it as one. --- iconv/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Comments
On Fri, Feb 26, 2021 at 1:15 PM H.J. Lu <hjl.tools@gmail.com> wrote: > > When glibc is configured with --enable-hardcoded-path-in-tests, > "make xcheck" failed with > > ... > env GCONV_PATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconvdata LOCPATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/localedata LC_ALL=C /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig --output=$tmp --nostdlib /usr/lib64/gconv; > ... > /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig: /lib64/libc.so.6: version `GLIBC_2.34' not found (required by /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig) > ... > FAIL: iconv/test-iconvconfig > > Since $(objpfx)iconvconfig is an installed program, run it as one. > --- > iconv/Makefile | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/iconv/Makefile b/iconv/Makefile > index 659857dd8c..4af3eea0d8 100644 > --- a/iconv/Makefile > +++ b/iconv/Makefile > @@ -95,11 +95,13 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) > $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) > $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) > > -$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig > +$(objpfx)test-iconvconfig.out: $(objpfx)iconvconfig > (set -e; \ > tmp=$(objpfx)gconv-modules.cache.$$$$; \ > rm -f $$tmp; \ > - $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \ > + $(built-program-cmd-before-env) \ > + $(run-program-env) $(built-program-cmd-after-env) $< \ > + --output=$$tmp --nostdlib $(inst_gconvdir); \ > cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \ > rm -f $$tmp) > $@; \ > $(evaluate-test) > -- > 2.29.2 > PING.
On Mon, Apr 19, 2021 at 5:55 AM H.J. Lu <hjl.tools@gmail.com> wrote: > > On Fri, Feb 26, 2021 at 1:15 PM H.J. Lu <hjl.tools@gmail.com> wrote: > > > > When glibc is configured with --enable-hardcoded-path-in-tests, > > "make xcheck" failed with > > > > ... > > env GCONV_PATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconvdata LOCPATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/localedata LC_ALL=C /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig --output=$tmp --nostdlib /usr/lib64/gconv; > > ... > > /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig: /lib64/libc.so.6: version `GLIBC_2.34' not found (required by /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig) > > ... > > FAIL: iconv/test-iconvconfig > > > > Since $(objpfx)iconvconfig is an installed program, run it as one. > > --- > > iconv/Makefile | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/iconv/Makefile b/iconv/Makefile > > index 659857dd8c..4af3eea0d8 100644 > > --- a/iconv/Makefile > > +++ b/iconv/Makefile > > @@ -95,11 +95,13 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) > > $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) > > $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) > > > > -$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig > > +$(objpfx)test-iconvconfig.out: $(objpfx)iconvconfig > > (set -e; \ > > tmp=$(objpfx)gconv-modules.cache.$$$$; \ > > rm -f $$tmp; \ > > - $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \ > > + $(built-program-cmd-before-env) \ > > + $(run-program-env) $(built-program-cmd-after-env) $< \ > > + --output=$$tmp --nostdlib $(inst_gconvdir); \ > > cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \ > > rm -f $$tmp) > $@; \ > > $(evaluate-test) > > -- > > 2.29.2 > > > > PING. > Are there any comments on this? If not, I will check it in tomorrow.
* H. J. Lu via Libc-alpha: > diff --git a/iconv/Makefile b/iconv/Makefile > index 659857dd8c..4af3eea0d8 100644 > --- a/iconv/Makefile > +++ b/iconv/Makefile > @@ -95,11 +95,13 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) > $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) > $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) > > -$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig > +$(objpfx)test-iconvconfig.out: $(objpfx)iconvconfig > (set -e; \ > tmp=$(objpfx)gconv-modules.cache.$$$$; \ > rm -f $$tmp; \ > - $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \ > + $(built-program-cmd-before-env) \ > + $(run-program-env) $(built-program-cmd-after-env) $< \ > + --output=$$tmp --nostdlib $(inst_gconvdir); \ > cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \ > rm -f $$tmp) > $@; \ > $(evaluate-test) Should tests use $(test-wrapper-env) instead of $(run-program-env) $(built-program-cmd-after-env)? I think it's commonly used (mostly along with shell scripts though). Thanks, Florian
diff --git a/iconv/Makefile b/iconv/Makefile index 659857dd8c..4af3eea0d8 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -95,11 +95,13 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) -$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig +$(objpfx)test-iconvconfig.out: $(objpfx)iconvconfig (set -e; \ tmp=$(objpfx)gconv-modules.cache.$$$$; \ rm -f $$tmp; \ - $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \ + $(built-program-cmd-before-env) \ + $(run-program-env) $(built-program-cmd-after-env) $< \ + --output=$$tmp --nostdlib $(inst_gconvdir); \ cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \ rm -f $$tmp) > $@; \ $(evaluate-test)