2018-02-07 17:26:17

by Daniel Díaz

[permalink] [raw]
Subject: [PATCH] selftests/futex: Fix line continuation in Makefile

The Makefile lacks a couple of line continuation backslashes
in an `if' clause, which produces an error while make'ing:

$ make
make[1]: Entering directory `/[...]/linux/tools/testing/selftests/futex'
/bin/sh: -c: line 5: syntax error: unexpected end of file
make[1]: *** [all] Error 1
make[1]: Leaving directory `/[...]/linux/tools/testing/selftests/futex'
make: *** [all] Error 2

Signed-off-by: Daniel Díaz <[email protected]>
---
tools/testing/selftests/futex/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile
index cea4adc..a63e845 100644
--- a/tools/testing/selftests/futex/Makefile
+++ b/tools/testing/selftests/futex/Makefile
@@ -12,9 +12,9 @@ all:
BUILD_TARGET=$(OUTPUT)/$$DIR; \
mkdir $$BUILD_TARGET -p; \
make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
- if [ -e $$DIR/$(TEST_PROGS) ]; then
- rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/;
- fi
+ if [ -e $$DIR/$(TEST_PROGS) ]; then \
+ rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \
+ fi \
done

override define RUN_TESTS
--
2.7.4



2018-02-13 21:29:01

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH] selftests/futex: Fix line continuation in Makefile

On 02/07/2018 10:24 AM, Daniel Díaz wrote:
> The Makefile lacks a couple of line continuation backslashes
> in an `if' clause, which produces an error while make'ing:
>
> $ make
> make[1]: Entering directory `/[...]/linux/tools/testing/selftests/futex'
> /bin/sh: -c: line 5: syntax error: unexpected end of file
> make[1]: *** [all] Error 1
> make[1]: Leaving directory `/[...]/linux/tools/testing/selftests/futex'
> make: *** [all] Error 2
>
> Signed-off-by: Daniel Díaz <[email protected]>
> ---
> tools/testing/selftests/futex/Makefile | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile
> index cea4adc..a63e845 100644
> --- a/tools/testing/selftests/futex/Makefile
> +++ b/tools/testing/selftests/futex/Makefile
> @@ -12,9 +12,9 @@ all:
> BUILD_TARGET=$(OUTPUT)/$$DIR; \
> mkdir $$BUILD_TARGET -p; \
> make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
> - if [ -e $$DIR/$(TEST_PROGS) ]; then
> - rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/;
> - fi
> + if [ -e $$DIR/$(TEST_PROGS) ]; then \
> + rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \
> + fi \
> done
>
> override define RUN_TESTS
>

Thanks for the patch. Applied to linux-kselftest fixes for 4.16-rc3

thanks,
-- Shuah

2018-02-14 01:35:21

by Darren Hart

[permalink] [raw]
Subject: Re: [PATCH] selftests/futex: Fix line continuation in Makefile

On Tue, Feb 13, 2018 at 02:26:46PM -0700, Shuah Khan wrote:
> On 02/07/2018 10:24 AM, Daniel D?az wrote:
> > The Makefile lacks a couple of line continuation backslashes
> > in an `if' clause, which produces an error while make'ing:
> >
> > $ make
> > make[1]: Entering directory `/[...]/linux/tools/testing/selftests/futex'
> > /bin/sh: -c: line 5: syntax error: unexpected end of file
> > make[1]: *** [all] Error 1
> > make[1]: Leaving directory `/[...]/linux/tools/testing/selftests/futex'
> > make: *** [all] Error 2
> >

What is the failure scenario here? Is this shell specific? What does /bin/sh
point to for you?

> > Signed-off-by: Daniel D?az <[email protected]>
> > ---
> > tools/testing/selftests/futex/Makefile | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile
> > index cea4adc..a63e845 100644
> > --- a/tools/testing/selftests/futex/Makefile
> > +++ b/tools/testing/selftests/futex/Makefile
> > @@ -12,9 +12,9 @@ all:
> > BUILD_TARGET=$(OUTPUT)/$$DIR; \
> > mkdir $$BUILD_TARGET -p; \
> > make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
> > - if [ -e $$DIR/$(TEST_PROGS) ]; then
> > - rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/;
> > - fi
> > + if [ -e $$DIR/$(TEST_PROGS) ]; then \
> > + rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \
> > + fi \
> > done
> >
> > override define RUN_TESTS
> >
>
> Thanks for the patch. Applied to linux-kselftest fixes for 4.16-rc3
>
> thanks,
> -- Shuah
>

--
Darren Hart
VMware Open Source Technology Center

2018-02-14 01:47:22

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH] selftests/futex: Fix line continuation in Makefile

On 02/13/2018 06:33 PM, Darren Hart wrote:
> On Tue, Feb 13, 2018 at 02:26:46PM -0700, Shuah Khan wrote:
>> On 02/07/2018 10:24 AM, Daniel Díaz wrote:
>>> The Makefile lacks a couple of line continuation backslashes
>>> in an `if' clause, which produces an error while make'ing:
>>>
>>> $ make
>>> make[1]: Entering directory `/[...]/linux/tools/testing/selftests/futex'
>>> /bin/sh: -c: line 5: syntax error: unexpected end of file
>>> make[1]: *** [all] Error 1
>>> make[1]: Leaving directory `/[...]/linux/tools/testing/selftests/futex'
>>> make: *** [all] Error 2
>>>
>
> What is the failure scenario here? Is this shell specific? What does /bin/sh
> point to for you?

My understanding is that this problem is seen with make versions prior to 4.x.
This specific problem is seen with make version 3.81

I will let Daniel Díaz share details on his environment.

thanks,
-- Shuah

2018-02-14 02:05:17

by Darren Hart

[permalink] [raw]
Subject: Re: [PATCH] selftests/futex: Fix line continuation in Makefile

On Tue, Feb 13, 2018 at 06:45:54PM -0700, Shuah Khan wrote:
> On 02/13/2018 06:33 PM, Darren Hart wrote:
> > On Tue, Feb 13, 2018 at 02:26:46PM -0700, Shuah Khan wrote:
> >> On 02/07/2018 10:24 AM, Daniel D?az wrote:
> >>> The Makefile lacks a couple of line continuation backslashes
> >>> in an `if' clause, which produces an error while make'ing:
> >>>
> >>> $ make
> >>> make[1]: Entering directory `/[...]/linux/tools/testing/selftests/futex'
> >>> /bin/sh: -c: line 5: syntax error: unexpected end of file
> >>> make[1]: *** [all] Error 1
> >>> make[1]: Leaving directory `/[...]/linux/tools/testing/selftests/futex'
> >>> make: *** [all] Error 2
> >>>
> >
> > What is the failure scenario here? Is this shell specific? What does /bin/sh
> > point to for you?
>
> My understanding is that this problem is seen with make versions prior to 4.x.
> This specific problem is seen with make version 3.81
>
> I will let Daniel D?az share details on his environment.

OK, thanks Shuah. I think this would be important to capture in the commit
message.

--
Darren Hart
VMware Open Source Technology Center

2018-02-14 14:51:17

by Daniel Díaz

[permalink] [raw]
Subject: Re: [PATCH] selftests/futex: Fix line continuation in Makefile

Hello!


On 13 February 2018 at 20:03, Darren Hart <[email protected]> wrote:
> On Tue, Feb 13, 2018 at 06:45:54PM -0700, Shuah Khan wrote:
[...]
>> My understanding is that this problem is seen with make versions prior to 4.x.
>> This specific problem is seen with make version 3.81
>> I will let Daniel Díaz share details on his environment.
>
> OK, thanks Shuah. I think this would be important to capture in the commit
> message.

That's correct -- fails with GNU Make 3.80, 3.81; works with GNU Make
3.82 and the 4.x series. Shuah, if you'd like me to resubmit let me
know.

Thanks and greetings!

Daniel Díaz
[email protected]

2018-02-14 15:06:41

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH] selftests/futex: Fix line continuation in Makefile

On 02/14/2018 07:49 AM, Daniel Díaz Rodríguez wrote:
> Hello!
>
>
> On 13 February 2018 at 20:03, Darren Hart <[email protected]> wrote:
>> On Tue, Feb 13, 2018 at 06:45:54PM -0700, Shuah Khan wrote:
> [...]
>>> My understanding is that this problem is seen with make versions prior to 4.x.
>>> This specific problem is seen with make version 3.81
>>> I will let Daniel Díaz share details on his environment.
>>
>> OK, thanks Shuah. I think this would be important to capture in the commit
>> message.

Thanks.

>
> That's correct -- fails with GNU Make 3.80, 3.81; works with GNU Make
> 3.82 and the 4.x series. Shuah, if you'd like me to resubmit let me
> know.
>

Thanks you both. I will update the commit log with the details on why
this fix is needed. No need to send an updated patch.

thanks,
-- Shuah