[Qemu-devel] [PATCH] build-sys: fix find-in-path

[Qemu-devel] [PATCH] build-sys: fix find-in-path

[Marc-André Lureau]

Fix spelling, the GNU make text functions is not called "find-string"
but "findstring".

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules.mak b/rules.mak
index 5c82c19..f721988 100644
--- a/rules.mak
+++ b/rules.mak
@@ -132,7 +132,7 @@ endef
 # Looks in the PATH if the argument contains no slash, else only considers one
 # specific directory.  Returns an # empty string if the program doesn't exist
 # there.
-find-in-path = $(if $(find-string /, $1), \
+find-in-path = $(if $(findstring /, $1), \
         $(wildcard $1), \
         $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))
 
-- 
2.10.0

Re: [Qemu-devel] [PATCH] build-sys: fix find-in-path

[Markus Armbruster]

Marc-André Lureau <marcandre.lureau@redhat.com> writes:

> Fix spelling, the GNU make text functions is not called "find-string"
> but "findstring".
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  rules.mak | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules.mak b/rules.mak
> index 5c82c19..f721988 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -132,7 +132,7 @@ endef
>  # Looks in the PATH if the argument contains no slash, else only considers one
>  # specific directory.  Returns an # empty string if the program doesn't exist
>  # there.
> -find-in-path = $(if $(find-string /, $1), \
> +find-in-path = $(if $(findstring /, $1), \
>          $(wildcard $1), \
>          $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))

Impact?

Re: [Qemu-devel] [PATCH] build-sys: fix find-in-path

[Marc-André Lureau]

Hi

----- Original Message -----
> Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> 
> > Fix spelling, the GNU make text functions is not called "find-string"
> > but "findstring".
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> >  rules.mak | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/rules.mak b/rules.mak
> > index 5c82c19..f721988 100644
> > --- a/rules.mak
> > +++ b/rules.mak
> > @@ -132,7 +132,7 @@ endef
> >  # Looks in the PATH if the argument contains no slash, else only considers
> >  one
> >  # specific directory.  Returns an # empty string if the program doesn't
> >  exist
> >  # there.
> > -find-in-path = $(if $(find-string /, $1), \
> > +find-in-path = $(if $(findstring /, $1), \
> >          $(wildcard $1), \
> >          $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))
> 
> Impact?

Not much in current code base, it's only used by:
tests/tcg/Makefile:ifneq ($(call find-in-path, $(CC_I386)),)

So if you set CC_I386 to an absolute PATH, it's not going to run the I386_TESTS.

This is not very important yet, but better for correctness.

In the future, I hope qemu can have a better tcg-test framework (I am doing some experiment in https://github.com/elmarco/qemu/tree/tcg-tests/tests/tcg), and as part of this work, I found this bug.

Re: [Qemu-devel] [PATCH] build-sys: fix find-in-path

[Markus Armbruster]

Marc-André Lureau <mlureau@redhat.com> writes:

> Hi
>
> ----- Original Message -----
>> Marc-André Lureau <marcandre.lureau@redhat.com> writes:
>> 
>> > Fix spelling, the GNU make text functions is not called "find-string"
>> > but "findstring".
>> >
>> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> > ---
>> >  rules.mak | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/rules.mak b/rules.mak
>> > index 5c82c19..f721988 100644
>> > --- a/rules.mak
>> > +++ b/rules.mak
>> > @@ -132,7 +132,7 @@ endef
>> >  # Looks in the PATH if the argument contains no slash, else only considers
>> >  one
>> >  # specific directory.  Returns an # empty string if the program doesn't
>> >  exist
>> >  # there.
>> > -find-in-path = $(if $(find-string /, $1), \
>> > +find-in-path = $(if $(findstring /, $1), \
>> >          $(wildcard $1), \
>> >          $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))
>> 
>> Impact?
>
> Not much in current code base, it's only used by:
> tests/tcg/Makefile:ifneq ($(call find-in-path, $(CC_I386)),)
>
> So if you set CC_I386 to an absolute PATH, it's not going to run the I386_TESTS.
>
> This is not very important yet, but better for correctness.
>
> In the future, I hope qemu can have a better tcg-test framework (I am doing some experiment in https://github.com/elmarco/qemu/tree/tcg-tests/tests/tcg), and as part of this work, I found this bug.

Thanks.  Suggest to amend the commit message with:

    Broken in commit 2b2e59e.  Fairly harmless: its only use is in
    tests/tcg/Makefile, where the bug can cause the I386_TESTS not to
    run when they should.

With this or something similar, you may add
Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH] build-sys: fix find-in-path

[Michael Tokarev]

Applied to trivial, with additional commit comment
suggested by Marcus, thanks!

/mjt