Message ID | 20190709013036.GA7671@vmh-VirtualBox |
---|---|
State | Committed |
Headers | show |
* Mao Han: > The test-wrapper is passed twice and no run_program_env is passed. I > don't know whether the test-wrapper script is unnecessary(last patch) > or the argument passed by Makefile is wrong: > > diff --git a/locale/Makefile b/locale/Makefile > index 0ad99ec..d78cf9b 100644 > --- a/locale/Makefile > +++ b/locale/Makefile > @@ -113,5 +113,5 @@ lib := locale-programs > include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) > > $(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale > - $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \ > + $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' '$(run-program-env)' > $@; \ > $(evaluate-test) Ah. Does this patch work for you? It looks more correct to me, but I have no way of testing it. Thanks, Florian
On Tue, Jul 09, 2019 at 12:16:12PM +0200, Florian Weimer wrote: > * Mao Han: > > > The test-wrapper is passed twice and no run_program_env is passed. I > > don't know whether the test-wrapper script is unnecessary(last patch) > > or the argument passed by Makefile is wrong: > > > > diff --git a/locale/Makefile b/locale/Makefile > > index 0ad99ec..d78cf9b 100644 > > --- a/locale/Makefile > > +++ b/locale/Makefile > > @@ -113,5 +113,5 @@ lib := locale-programs > > include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) > > > > $(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale > > - $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \ > > + $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' '$(run-program-env)' > $@; \ > > $(evaluate-test) > > Ah. Does this patch work for you? It looks more correct to me, but I > have no way of testing it. > > Thanks, > Florian Yes, I've tested this patch on C-SKY QEMU, it works fine. Thanks, Mao Han
* Mao Han: > On Tue, Jul 09, 2019 at 12:16:12PM +0200, Florian Weimer wrote: >> * Mao Han: >> >> > The test-wrapper is passed twice and no run_program_env is passed. I >> > don't know whether the test-wrapper script is unnecessary(last patch) >> > or the argument passed by Makefile is wrong: >> > >> > diff --git a/locale/Makefile b/locale/Makefile >> > index 0ad99ec..d78cf9b 100644 >> > --- a/locale/Makefile >> > +++ b/locale/Makefile >> > @@ -113,5 +113,5 @@ lib := locale-programs >> > include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) >> > >> > $(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale >> > - $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \ >> > + $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' '$(run-program-env)' > $@; \ >> > $(evaluate-test) >> >> Ah. Does this patch work for you? It looks more correct to me, but I >> have no way of testing it. >> >> Thanks, >> Florian > > Yes, I've tested this patch on C-SKY QEMU, it works fine. Great. Please push this change along with an appropriate ChangeLog entry. Thanks, Florian
diff --git a/locale/Makefile b/locale/Makefile index 0ad99ec..d78cf9b 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -113,5 +113,5 @@ lib := locale-programs include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) $(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale - $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \ + $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' '$(run-program-env)' > $@; \ $(evaluate-test)