Skip to contentSkip to conversation

selftests/filesystems: Don't run dnotify_test by default

PATCH In review Michael Ellerman 3 participants 4 messages Apr 10, 2018 – Apr 11, 2018 Kselftest

lore
Share & tools
lore
#0 lore raw

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

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 at ellerman.id.au>
---
 tools/testing/selftests/filesystems/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
tools/testing/selftests/filesystems/Makefile +3 -5
index 4e6d09fb166f..5c7d7001ad37 100644
@@ -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
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · 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).

Quoted 6 lines

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 at 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 at ubuntu.com>
Quoted 23 lines
---
 tools/testing/selftests/filesystems/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
tools/testing/selftests/filesystems/Makefile +3 -5
index 4e6d09fb166f..5c7d7001ad37 100644
@@ -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
Signature · 1 line
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 11 lines · Christian Brauner
Quoted 10 lines · 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).

Typo - I can fix it when I apply it.

Quoted 11 lines
Quoted 7 lines

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 at 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.

Quoted 2 lines
Acked-by Christian brauner <christian.brauner at ubuntu.com>

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

-- Shuah

--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 9 lines · Shuah Khan
Quoted 8 lines · Christian Brauner
Quoted 7 lines · 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.

Quoted 5 lines
Quoted 3 lines
Quoted 3 lines

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.

Quoted 11 lines
Quoted 10 lines
Quoted 6 lines

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 at 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.

Quoted 6 lines

This way the test gets built and gets included in the installed tests. This way somebody can run it by itself.

Quoted 2 lines
Acked-by Christian brauner <christian.brauner at ubuntu.com>

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

Thanks.

cheers
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html