diff mbox series

iconv: Use $(run-program-prefix) for running iconv (bug 32197)

Message ID 871q19h28n.fsf@oldenburg.str.redhat.com
State New
Headers show
Series iconv: Use $(run-program-prefix) for running iconv (bug 32197) | expand

Commit Message

Florian Weimer Sept. 24, 2024, 8:42 a.m. UTC 
With --enable-hardcoded-path-in-tests, $(test-program-prefix)
does not redirect to the built glibc, but we need to run
iconv (the program) against the built glibc even with
--enable-hardcoded-path-in-tests, as it is using the ABI
path for the dynamic linker (as an installed program).
Use $(run-program-prefix) instead.

---
 iconv/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


base-commit: 16a59571e4e9fd019d3fc23a2e7d73c1df8bb5cb

Comments

H.J. Lu Sept. 24, 2024, 10:20 a.m. UTC | #1 
On Tue, Sep 24, 2024 at 4:42 PM Florian Weimer <fweimer@redhat.com> wrote:
>
> With --enable-hardcoded-path-in-tests, $(test-program-prefix)
> does not redirect to the built glibc, but we need to run
> iconv (the program) against the built glibc even with
> --enable-hardcoded-path-in-tests, as it is using the ABI
> path for the dynamic linker (as an installed program).
> Use $(run-program-prefix) instead.
>
> ---
>  iconv/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/iconv/Makefile b/iconv/Makefile
> index c9af0c4d44..de9d964ed3 100644
> --- a/iconv/Makefile
> +++ b/iconv/Makefile
> @@ -153,14 +153,14 @@ $(objpfx)tst-translit-mchar.out: tst-translit-mchar.sh \
>
>  $(objpfx)tst-iconv_prog-buffer.out: \
>    tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
> -       $(BASH) $< $(common-objdir) '$(test-program-prefix)' > $@; \
> +       $(BASH) $< $(common-objdir) '$(run-program-prefix)' > $@; \
>         $(evaluate-test)
>  $(objpfx)tst-iconv_prog-buffer-tiny.out: \
>    tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
> -       $(BASH) $< $(common-objdir) '$(test-program-prefix)' \
> +       $(BASH) $< $(common-objdir) '$(run-program-prefix)' \
>           '--buffer-size=1' > $@; \
>         $(evaluate-test)
>  $(objpfx)tst-iconv_prog-buffer-large.out: \
>    tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
> -       $(BASH) $< $(common-objdir) '$(test-program-prefix)' '' '22' > $@; \
> +       $(BASH) $< $(common-objdir) '$(run-program-prefix)' '' '22' > $@; \
>         $(evaluate-test)
>
> base-commit: 16a59571e4e9fd019d3fc23a2e7d73c1df8bb5cb
>

LGTM.

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>

Thanks.
diff mbox series

Patch

diff --git a/iconv/Makefile b/iconv/Makefile
index c9af0c4d44..de9d964ed3 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -153,14 +153,14 @@  $(objpfx)tst-translit-mchar.out: tst-translit-mchar.sh \
 
 $(objpfx)tst-iconv_prog-buffer.out: \
   tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
-	$(BASH) $< $(common-objdir) '$(test-program-prefix)' > $@; \
+	$(BASH) $< $(common-objdir) '$(run-program-prefix)' > $@; \
 	$(evaluate-test)
 $(objpfx)tst-iconv_prog-buffer-tiny.out: \
   tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
-	$(BASH) $< $(common-objdir) '$(test-program-prefix)' \
+	$(BASH) $< $(common-objdir) '$(run-program-prefix)' \
 	  '--buffer-size=1' > $@; \
 	$(evaluate-test)
 $(objpfx)tst-iconv_prog-buffer-large.out: \
   tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
-	$(BASH) $< $(common-objdir) '$(test-program-prefix)' '' '22' > $@; \
+	$(BASH) $< $(common-objdir) '$(run-program-prefix)' '' '22' > $@; \
 	$(evaluate-test)