From: "H.J. Lu" <hjl.tools@gmail.com>
To: Florian Weimer <fweimer@redhat.com>
Cc: "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org>
Subject: [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477]
Date: Thu, 6 May 2021 11:04:14 -0700 [thread overview]
Message-ID: <CAMe9rOp9iPQbSnERX8Oi=h_TDtoTXyC4X03vo4CMqpvmUgbpuA@mail.gmail.com> (raw)
In-Reply-To: <871rajhon4.fsf@oldenburg.str.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
On Thu, May 6, 2021 at 8:23 AM Florian Weimer <fweimer@redhat.com> wrote:
>
> * 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)
I think we should use
$(run-program-prefix) $(objpfx)iconvconfig
> $(built-program-cmd-after-env)? I think it's commonly used (mostly
> along with shell scripts though).
>
> Thanks,
> Florian
>
Here is the v2 patch.
--
H.J.
[-- Attachment #2: v2-0001-Run-objpfx-iconvconfig-with-run-program-prefix-BZ.patch --]
[-- Type: text/x-patch, Size: 1858 bytes --]
From 3eecd04de751a0d6df007da6826e7daa4c7609ce Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 26 Feb 2021 13:07:18 -0800
Subject: [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ
#27477]
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 with
$(run-program-prefix).
---
iconv/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/iconv/Makefile b/iconv/Makefile
index 659857dd8c..a9b267c851 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -95,11 +95,12 @@ $(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); \
+ $(run-program-prefix) $(objpfx)iconvconfig \
+ --output=$$tmp --nostdlib $(inst_gconvdir); \
cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \
rm -f $$tmp) > $@; \
$(evaluate-test)
--
2.31.1
next prev parent reply other threads:[~2021-05-06 18:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 21:15 [PATCH] Run $(objpfx)iconvconfig as an installed program H.J. Lu
2021-04-19 12:55 ` PING^1 " H.J. Lu
2021-05-06 15:07 ` PING^2 " H.J. Lu
2021-05-06 15:23 ` Florian Weimer
2021-05-06 18:04 ` H.J. Lu [this message]
2021-05-07 10:21 ` [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477] Florian Weimer
2021-05-07 11:39 ` H.J. Lu
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='CAMe9rOp9iPQbSnERX8Oi=h_TDtoTXyC4X03vo4CMqpvmUgbpuA@mail.gmail.com' \
--to=hjl.tools@gmail.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).