* [PATCH] Run $(objpfx)iconvconfig as an installed program
@ 2021-02-26 21:15 H.J. Lu
2021-04-19 12:55 ` PING^1 " H.J. Lu
2021-05-06 15:23 ` Florian Weimer
0 siblings, 2 replies; 7+ messages in thread
From: H.J. Lu @ 2021-02-26 21:15 UTC (permalink / raw)
To: libc-alpha; +Cc: Florian Weimer
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* PING^1 [PATCH] Run $(objpfx)iconvconfig as an installed program
2021-02-26 21:15 [PATCH] Run $(objpfx)iconvconfig as an installed program H.J. Lu
@ 2021-04-19 12:55 ` H.J. Lu
2021-05-06 15:07 ` PING^2 " H.J. Lu
2021-05-06 15:23 ` Florian Weimer
1 sibling, 1 reply; 7+ messages in thread
From: H.J. Lu @ 2021-04-19 12:55 UTC (permalink / raw)
To: libc-alpha; +Cc: Florian Weimer
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.
--
H.J.
^ permalink raw reply [flat|nested] 7+ messages in thread
* PING^2 [PATCH] Run $(objpfx)iconvconfig as an installed program
2021-04-19 12:55 ` PING^1 " H.J. Lu
@ 2021-05-06 15:07 ` H.J. Lu
0 siblings, 0 replies; 7+ messages in thread
From: H.J. Lu @ 2021-05-06 15:07 UTC (permalink / raw)
To: GNU C Library; +Cc: Florian Weimer
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Run $(objpfx)iconvconfig as an installed program
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:23 ` Florian Weimer
2021-05-06 18:04 ` [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477] H.J. Lu
1 sibling, 1 reply; 7+ messages in thread
From: Florian Weimer @ 2021-05-06 15:23 UTC (permalink / raw)
To: H.J. Lu via Libc-alpha
* 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477]
2021-05-06 15:23 ` Florian Weimer
@ 2021-05-06 18:04 ` H.J. Lu
2021-05-07 10:21 ` Florian Weimer
0 siblings, 1 reply; 7+ messages in thread
From: H.J. Lu @ 2021-05-06 18:04 UTC (permalink / raw)
To: Florian Weimer; +Cc: H.J. Lu via Libc-alpha
[-- 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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-05-07 11:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477] H.J. Lu
2021-05-07 10:21 ` Florian Weimer
2021-05-07 11:39 ` H.J. Lu
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).