| Message ID | 1517961219-17700-1-git-send-email-daniel.diaz@linaro.org |
|---|---|
| State | Accepted |
| Commit | 64136fb76039defd193e9e885bb722919d220021 |
| Headers | show |
| Series | selftests/android: Fix line continuation in Makefile | expand |
On Wed, Feb 7, 2018 at 5:22 AM, Daniel Díaz <daniel.diaz@linaro.org> wrote: > The Makefile lacks a couple of line continuation backslashes > in an `if' clause, which can make the subsequent rsync > command go awry over the whole filesystem (`rsync -a / /`). > > /bin/sh: -c: line 5: syntax error: unexpected end of file > make[1]: [all] Error 1 (ignored) > TEST=$DIR"_test.sh"; \ > if [ -e $DIR/$TEST ]; then > /bin/sh: -c: line 2: syntax error: unexpected end of file > make[1]: [all] Error 1 (ignored) > rsync -a $DIR/$TEST $BUILD_TARGET/; > [...a myriad of:] > [ rsync: readlink_stat("...") failed: Permission denied (13)] > [ skipping non-regular file "..."] > [ rsync: opendir "..." failed: Permission denied (13)] > [and many other errors...] > fi > make[1]: fi: Command not found > make[1]: [all] Error 127 (ignored) > done > make[1]: done: Command not found > make[1]: [all] Error 127 (ignored) > > Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> > --- > tools/testing/selftests/android/Makefile | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile > index 1a74922..f6304d2 100644 > --- a/tools/testing/selftests/android/Makefile > +++ b/tools/testing/selftests/android/Makefile > @@ -11,11 +11,11 @@ all: > BUILD_TARGET=$(OUTPUT)/$$DIR; \ > mkdir $$BUILD_TARGET -p; \ > make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ > - #SUBDIR test prog name should be in the form: SUBDIR_test.sh > + #SUBDIR test prog name should be in the form: SUBDIR_test.sh \ > TEST=$$DIR"_test.sh"; \ > - if [ -e $$DIR/$$TEST ]; then > - rsync -a $$DIR/$$TEST $$BUILD_TARGET/; > - fi > + if [ -e $$DIR/$$TEST ]; then \ > + rsync -a $$DIR/$$TEST $$BUILD_TARGET/; \ > + fi \ > done Thanks for your patch. However, I have copied this Makefile from tools/testing/selftests/futex/Makefile before modifying it. If there is a problem with backslash then the same problem must be there in futex Makefile as well. Can you compare these 2 Makefile and see if there is any problem. Also is it because of make version ? Can you check your make version ? Thank You! Pintu > > override define RUN_TESTS > -- > 2.7.4 >
Hello! On 7 February 2018 at 00:01, Pintu Kumar <pintu.ping@gmail.com> wrote: [...] > Thanks for your patch. > However, I have copied this Makefile from > tools/testing/selftests/futex/Makefile before modifying it. > If there is a problem with backslash then the same problem must be > there in futex Makefile as well. There is. Patch coming. [...] > Also is it because of make version ? > Can you check your make version ? It's make 3.81. Thanks and greetings! Daniel Díaz daniel.diaz@linaro.org
On Wed, Feb 7, 2018 at 10:46 PM, Daniel Díaz Rodríguez <daniel.diaz@linaro.org> wrote: > Hello! > > > On 7 February 2018 at 00:01, Pintu Kumar <pintu.ping@gmail.com> wrote: > [...] >> Thanks for your patch. >> However, I have copied this Makefile from >> tools/testing/selftests/futex/Makefile before modifying it. >> If there is a problem with backslash then the same problem must be >> there in futex Makefile as well. > > There is. Patch coming. OK > > > [...] >> Also is it because of make version ? >> Can you check your make version ? > > It's make 3.81. My make version was 4.1. So I did not face any problem. I guess this problem is fixed from make version 4.x on wards. However, for backward compatibility we can include these change. So, its looks good for me, however someone else must approve it. > > Thanks and greetings! > > Daniel Díaz > daniel.diaz@linaro.org
On Wed, Feb 7, 2018 at 5:22 AM, Daniel Díaz <daniel.diaz@linaro.org> wrote: > The Makefile lacks a couple of line continuation backslashes > in an `if' clause, which can make the subsequent rsync > command go awry over the whole filesystem (`rsync -a / /`). > > /bin/sh: -c: line 5: syntax error: unexpected end of file > make[1]: [all] Error 1 (ignored) > TEST=$DIR"_test.sh"; \ > if [ -e $DIR/$TEST ]; then > /bin/sh: -c: line 2: syntax error: unexpected end of file > make[1]: [all] Error 1 (ignored) > rsync -a $DIR/$TEST $BUILD_TARGET/; > [...a myriad of:] > [ rsync: readlink_stat("...") failed: Permission denied (13)] > [ skipping non-regular file "..."] > [ rsync: opendir "..." failed: Permission denied (13)] > [and many other errors...] > fi > make[1]: fi: Command not found > make[1]: [all] Error 127 (ignored) > done > make[1]: done: Command not found > make[1]: [all] Error 127 (ignored) > > Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> > --- > tools/testing/selftests/android/Makefile | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile > index 1a74922..f6304d2 100644 > --- a/tools/testing/selftests/android/Makefile > +++ b/tools/testing/selftests/android/Makefile > @@ -11,11 +11,11 @@ all: > BUILD_TARGET=$(OUTPUT)/$$DIR; \ > mkdir $$BUILD_TARGET -p; \ > make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ > - #SUBDIR test prog name should be in the form: SUBDIR_test.sh > + #SUBDIR test prog name should be in the form: SUBDIR_test.sh \ > TEST=$$DIR"_test.sh"; \ > - if [ -e $$DIR/$$TEST ]; then > - rsync -a $$DIR/$$TEST $$BUILD_TARGET/; > - fi > + if [ -e $$DIR/$$TEST ]; then \ > + rsync -a $$DIR/$$TEST $$BUILD_TARGET/; \ > + fi \ > done > > override define RUN_TESTS Acked-by: Pintu Agarwal <pintu.ping@gmail.com> > -- > 2.7.4 >
On 02/06/2018 04:52 PM, Daniel Díaz wrote: > The Makefile lacks a couple of line continuation backslashes > in an `if' clause, which can make the subsequent rsync > command go awry over the whole filesystem (`rsync -a / /`). > > /bin/sh: -c: line 5: syntax error: unexpected end of file > make[1]: [all] Error 1 (ignored) > TEST=$DIR"_test.sh"; \ > if [ -e $DIR/$TEST ]; then > /bin/sh: -c: line 2: syntax error: unexpected end of file > make[1]: [all] Error 1 (ignored) > rsync -a $DIR/$TEST $BUILD_TARGET/; > [...a myriad of:] > [ rsync: readlink_stat("...") failed: Permission denied (13)] > [ skipping non-regular file "..."] > [ rsync: opendir "..." failed: Permission denied (13)] > [and many other errors...] > fi > make[1]: fi: Command not found > make[1]: [all] Error 127 (ignored) > done > make[1]: done: Command not found > make[1]: [all] Error 127 (ignored) > > Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> > --- > tools/testing/selftests/android/Makefile | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile > index 1a74922..f6304d2 100644 > --- a/tools/testing/selftests/android/Makefile > +++ b/tools/testing/selftests/android/Makefile > @@ -11,11 +11,11 @@ all: > BUILD_TARGET=$(OUTPUT)/$$DIR; \ > mkdir $$BUILD_TARGET -p; \ > make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ > - #SUBDIR test prog name should be in the form: SUBDIR_test.sh > + #SUBDIR test prog name should be in the form: SUBDIR_test.sh \ > TEST=$$DIR"_test.sh"; \ > - if [ -e $$DIR/$$TEST ]; then > - rsync -a $$DIR/$$TEST $$BUILD_TARGET/; > - fi > + if [ -e $$DIR/$$TEST ]; then \ > + rsync -a $$DIR/$$TEST $$BUILD_TARGET/; \ > + fi \ > done > > override define RUN_TESTS > Thanks for the patch. Applied to linux-kselftest fixes for 4.16-rc3 thanks, -- Shuah
diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile index 1a74922..f6304d2 100644 --- a/tools/testing/selftests/android/Makefile +++ b/tools/testing/selftests/android/Makefile @@ -11,11 +11,11 @@ all: BUILD_TARGET=$(OUTPUT)/$$DIR; \ mkdir $$BUILD_TARGET -p; \ make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ - #SUBDIR test prog name should be in the form: SUBDIR_test.sh + #SUBDIR test prog name should be in the form: SUBDIR_test.sh \ TEST=$$DIR"_test.sh"; \ - if [ -e $$DIR/$$TEST ]; then - rsync -a $$DIR/$$TEST $$BUILD_TARGET/; - fi + if [ -e $$DIR/$$TEST ]; then \ + rsync -a $$DIR/$$TEST $$BUILD_TARGET/; \ + fi \ done override define RUN_TESTS
The Makefile lacks a couple of line continuation backslashes in an `if' clause, which can make the subsequent rsync command go awry over the whole filesystem (`rsync -a / /`). /bin/sh: -c: line 5: syntax error: unexpected end of file make[1]: [all] Error 1 (ignored) TEST=$DIR"_test.sh"; \ if [ -e $DIR/$TEST ]; then /bin/sh: -c: line 2: syntax error: unexpected end of file make[1]: [all] Error 1 (ignored) rsync -a $DIR/$TEST $BUILD_TARGET/; [...a myriad of:] [ rsync: readlink_stat("...") failed: Permission denied (13)] [ skipping non-regular file "..."] [ rsync: opendir "..." failed: Permission denied (13)] [and many other errors...] fi make[1]: fi: Command not found make[1]: [all] Error 127 (ignored) done make[1]: done: Command not found make[1]: [all] Error 127 (ignored) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> --- tools/testing/selftests/android/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.7.4