[PATCH] selftests: futex: fix run_tests target

[PATCH] selftests: futex: fix run_tests target

[Shuah Khan]

make -C tools/testing/selftests/futex/ run_tests doesn't run the tests.
Running run_tests target only when $(OUTPUT) is the $(PWD) is incorrect.
When $(OUTPUT) is empty, run_tests will not run. Fix it.

Fixes: a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT")
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
 tools/testing/selftests/futex/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile
index e2fbb890aef9..7c647f619d63 100644
--- a/tools/testing/selftests/futex/Makefile
+++ b/tools/testing/selftests/futex/Makefile
@@ -14,7 +14,7 @@ all:
 	done
 
 override define RUN_TESTS
-	@if [ `dirname $(OUTPUT)` = $(PWD) ]; then ./run.sh; fi
+	$(OUTPUT)/run.sh
 endef
 
 override define INSTALL_RULE
-- 
2.11.0

Re: [PATCH] selftests: futex: fix run_tests target

[Darren Hart]

On Wed, Aug 02, 2017 at 04:31:42PM -0600, Shuah Khan wrote:
> make -C tools/testing/selftests/futex/ run_tests doesn't run the tests.
> Running run_tests target only when $(OUTPUT) is the $(PWD) is incorrect.
> When $(OUTPUT) is empty, run_tests will not run. Fix it.
> 
> Fixes: a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT")
> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>

So this indeed addresses the problem you reported.

I'm curious about why this was changed like it was. I presume to avoid
some issues with relative paths, like the ./run.sh and the "cd
functional" within run.sh.... but I haven't been able to trigger that.

When you say $(OUTPUT) is empty - when does that occur? Because if it
was in fact "" then the change below would attempt to execute /run.sh
... which is surely not what we want.

> ---
>  tools/testing/selftests/futex/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile
> index e2fbb890aef9..7c647f619d63 100644
> --- a/tools/testing/selftests/futex/Makefile
> +++ b/tools/testing/selftests/futex/Makefile
> @@ -14,7 +14,7 @@ all:
>  	done
>  
>  override define RUN_TESTS
> -	@if [ `dirname $(OUTPUT)` = $(PWD) ]; then ./run.sh; fi
> +	$(OUTPUT)/run.sh
>  endef
>  
>  override define INSTALL_RULE
> -- 
> 2.11.0
> 
> 

-- 
Darren Hart
VMware Open Source Technology Center

Re: [PATCH] selftests: futex: fix run_tests target

[Shuah Khan]

On 08/02/2017 06:52 PM, Darren Hart wrote:
> On Wed, Aug 02, 2017 at 04:31:42PM -0600, Shuah Khan wrote:
>> make -C tools/testing/selftests/futex/ run_tests doesn't run the tests.
>> Running run_tests target only when $(OUTPUT) is the $(PWD) is incorrect.
>> When $(OUTPUT) is empty, run_tests will not run. Fix it.
>>
>> Fixes: a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT")
>> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> 
> So this indeed addresses the problem you reported.
> 
> I'm curious about why this was changed like it was. I presume to avoid
> some issues with relative paths, like the ./run.sh and the "cd
> functional" within run.sh.... but I haven't been able to trigger that.> 
> When you say $(OUTPUT) is empty - when does that occur? Because if it
> was in fact "" then the change below would attempt to execute /run.sh
> ... which is surely not what we want.

This will not happen. At this stage, OUTPUT will not be empty.

I didn't explain the condition correctly in my change log. When OUTPUT
isn't set (which is the usual case when test is run using:

make -C tools/testing/selftests/futex run_tests

lib.mk sets it to OUTPUT := $(shell pwd)

So OUTPUT will be the current directory when run_tests are run.

> 
>> ---
>>  tools/testing/selftests/futex/Makefile | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile
>> index e2fbb890aef9..7c647f619d63 100644
>> --- a/tools/testing/selftests/futex/Makefile
>> +++ b/tools/testing/selftests/futex/Makefile
>> @@ -14,7 +14,7 @@ all:
>>  	done
>>  
>>  override define RUN_TESTS
>> -	@if [ `dirname $(OUTPUT)` = $(PWD) ]; then ./run.sh; fi

The above change was made in conjunction with the
a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT")

The above change didn't anticipate failures when tests are run outside
the selftests/Makefile umbrella via make -C tools/testing/selftests/testdir

>> +	$(OUTPUT)/run.sh
>>  endef
>>  
>>  override define INSTALL_RULE
>> -- 
>> 2.11.0
>>
>>
> 

thanks,
-- Shuah

Re: [PATCH] selftests: futex: fix run_tests target

[Darren Hart]

On Wed, Aug 02, 2017 at 07:06:39PM -0600, Shuah Khan wrote:
> On 08/02/2017 06:52 PM, Darren Hart wrote:
> > On Wed, Aug 02, 2017 at 04:31:42PM -0600, Shuah Khan wrote:
> >> make -C tools/testing/selftests/futex/ run_tests doesn't run the tests.
> >> Running run_tests target only when $(OUTPUT) is the $(PWD) is incorrect.
> >> When $(OUTPUT) is empty, run_tests will not run. Fix it.
> >>
> >> Fixes: a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT")
> >> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> > 
> > So this indeed addresses the problem you reported.
> > 
> > I'm curious about why this was changed like it was. I presume to avoid
> > some issues with relative paths, like the ./run.sh and the "cd
> > functional" within run.sh.... but I haven't been able to trigger that.> 
> > When you say $(OUTPUT) is empty - when does that occur? Because if it
> > was in fact "" then the change below would attempt to execute /run.sh
> > ... which is surely not what we want.
> 
> This will not happen. At this stage, OUTPUT will not be empty.
> 
> I didn't explain the condition correctly in my change log. When OUTPUT
> isn't set (which is the usual case when test is run using:
> 
> make -C tools/testing/selftests/futex run_tests
> 
> lib.mk sets it to OUTPUT := $(shell pwd)
> 
> So OUTPUT will be the current directory when run_tests are run.

Thank you for the clarification.

Reviewed-by: Darren Hart (VMware) <dvhart@infradead.org>

-- 
Darren Hart
VMware Open Source Technology Center