[PATCH] selftests/filesystems: Don't run dnotify_test by default

[PATCH] selftests/filesystems: Don't run dnotify_test by default

[Michael Ellerman]

In commit ce290a19609d ("selftests: add devpts selftests"), the
filesystems directory was added to the top-level selftests Makefile.

That had the effect of causing the existing dnotify_test in the
filesystems directory to now be run as part of the default selftests
test-run. Unfortunately dnotify_test is actually an infinite loop.

Fix it by moving dnotify_test to TEST_GEN_PROGS_EXTENDED, which says
that it's a generated file (ie. built) but should not be run as part
of the default test suite run (it's an "extendend" test).

While we're here cleanup a few other things, devpts_pts should be in
TEST_GEN_PROGS to indicate that it's built, and with the above two
changes we no longer need a custom all or clean rule.

Fixes: ce290a19609d ("selftests: add devpts selftests")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 tools/testing/selftests/filesystems/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/filesystems/Makefile b/tools/testing/selftests/filesystems/Makefile
index 4e6d09fb166f..5c7d7001ad37 100644
--- a/tools/testing/selftests/filesystems/Makefile
+++ b/tools/testing/selftests/filesystems/Makefile
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := dnotify_test devpts_pts
-all: $(TEST_PROGS)
 
-include ../lib.mk
+TEST_GEN_PROGS := devpts_pts
+TEST_GEN_PROGS_EXTENDED := dnotify_test
 
-clean:
-	rm -fr $(TEST_PROGS)
+include ../lib.mk
-- 
2.14.1

Re: [PATCH] selftests/filesystems: Don't run dnotify_test by default

[Christian Brauner]

On Tue, Apr 10, 2018 at 04:20:53PM +1000, Michael Ellerman wrote:
> In commit ce290a19609d ("selftests: add devpts selftests"), the
> filesystems directory was added to the top-level selftests Makefile.
> 
> That had the effect of causing the existing dnotify_test in the
> filesystems directory to now be run as part of the default selftests
> test-run. Unfortunately dnotify_test is actually an infinite loop.
> 
> Fix it by moving dnotify_test to TEST_GEN_PROGS_EXTENDED, which says
> that it's a generated file (ie. built) but should not be run as part
> of the default test suite run (it's an "extendend" test).
> 
> While we're here cleanup a few other things, devpts_pts should be in
> TEST_GEN_PROGS to indicate that it's built, and with the above two
> changes we no longer need a custom all or clean rule.
> 
> Fixes: ce290a19609d ("selftests: add devpts selftests")
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

I'm not sure if I should've made it to be built given that it wasn't
before but it probably doesn't hurt. It's either that or remove it I
guess.

Acked-by: Christian brauner <christian.brauner@ubuntu.com>

> ---
>  tools/testing/selftests/filesystems/Makefile | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/testing/selftests/filesystems/Makefile b/tools/testing/selftests/filesystems/Makefile
> index 4e6d09fb166f..5c7d7001ad37 100644
> --- a/tools/testing/selftests/filesystems/Makefile
> +++ b/tools/testing/selftests/filesystems/Makefile
> @@ -1,8 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
> -TEST_PROGS := dnotify_test devpts_pts
> -all: $(TEST_PROGS)
>  
> -include ../lib.mk
> +TEST_GEN_PROGS := devpts_pts
> +TEST_GEN_PROGS_EXTENDED := dnotify_test
>  
> -clean:
> -	rm -fr $(TEST_PROGS)
> +include ../lib.mk
> -- 
> 2.14.1
> 

Re: [PATCH] selftests/filesystems: Don't run dnotify_test by default

[Shuah Khan]

On 04/10/2018 03:45 AM, Christian Brauner wrote:
> On Tue, Apr 10, 2018 at 04:20:53PM +1000, Michael Ellerman wrote:
>> In commit ce290a19609d ("selftests: add devpts selftests"), the
>> filesystems directory was added to the top-level selftests Makefile.
>>
>> That had the effect of causing the existing dnotify_test in the
>> filesystems directory to now be run as part of the default selftests
>> test-run. Unfortunately dnotify_test is actually an infinite loop.
>>
>> Fix it by moving dnotify_test to TEST_GEN_PROGS_EXTENDED, which says
>> that it's a generated file (ie. built) but should not be run as part
>> of the default test suite run (it's an "extendend" test).

Typo - I can fix it when I apply it.

>>
>> While we're here cleanup a few other things, devpts_pts should be in
>> TEST_GEN_PROGS to indicate that it's built, and with the above two
>> changes we no longer need a custom all or clean rule.
>>
>> Fixes: ce290a19609d ("selftests: add devpts selftests")
>> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> 
> I'm not sure if I should've made it to be built given that it wasn't
> before but it probably doesn't hurt. It's either that or remove it I
> guess.

This way the test gets built and gets included in the installed tests.
This way somebody can run it by itself.
> 
> Acked-by: Christian brauner <christian.brauner@ubuntu.com>

Thanks Michael. I will get this into 4.17-rc2 or rc3.

-- Shuah

Re: [PATCH] selftests/filesystems: Don't run dnotify_test by default

[Michael Ellerman]

Shuah Khan <shuahkh@osg.samsung.com> writes:
> On 04/10/2018 03:45 AM, Christian Brauner wrote:
>> On Tue, Apr 10, 2018 at 04:20:53PM +1000, Michael Ellerman wrote:
>>> In commit ce290a19609d ("selftests: add devpts selftests"), the
>>> filesystems directory was added to the top-level selftests Makefile.
>>>
>>> That had the effect of causing the existing dnotify_test in the
>>> filesystems directory to now be run as part of the default selftests
>>> test-run. Unfortunately dnotify_test is actually an infinite loop.
>>>
>>> Fix it by moving dnotify_test to TEST_GEN_PROGS_EXTENDED, which says
>>> that it's a generated file (ie. built) but should not be run as part
>>> of the default test suite run (it's an "extendend" test).
>
> Typo - I can fix it when I apply it.

Oops, thanks.

>>> While we're here cleanup a few other things, devpts_pts should be in
>>> TEST_GEN_PROGS to indicate that it's built, and with the above two
>>> changes we no longer need a custom all or clean rule.
>>>
>>> Fixes: ce290a19609d ("selftests: add devpts selftests")
>>> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
>> 
>> I'm not sure if I should've made it to be built given that it wasn't
>> before but it probably doesn't hurt. It's either that or remove it I
>> guess.
>
> This way the test gets built and gets included in the installed tests.
> This way somebody can run it by itself.
>> 
>> Acked-by: Christian brauner <christian.brauner@ubuntu.com>
>
> Thanks Michael. I will get this into 4.17-rc2 or rc3.

Thanks.

cheers