| Message ID | 20230314123414.26907-1-tklauser@distanz.ch |
|---|---|
| State | Accepted |
| Commit | d95debbdc528d50042807754d6085c15abc21768 |
| Headers | show |
| Series | [v2] selftests/clone3: fix number of tests in ksft_set_plan | expand |
On Tue, Mar 14, 2023 at 01:34:14PM +0100, Tobias Klauser wrote: > Commit 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > added an additional test, so the number passed to ksft_set_plan needs to > be bumped accordingly. > > Also use ksft_finished() to print results and exit. This will catch future > mismatches between ksft_set_plan() and the number of tests being run. > > Fixes: 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > Cc: Christian Brauner <brauner@kernel.org> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > --- Looks good. Thanks for fixing this, Reviewed-by: Christian Brauner <brauner@kernel.org> Feel free to take this through the selftests tree, Shuah.
On 2023-03-14 at 14:09:59 +0100, Christian Brauner <brauner@kernel.org> wrote: > On Tue, Mar 14, 2023 at 01:34:14PM +0100, Tobias Klauser wrote: > > Commit 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > > added an additional test, so the number passed to ksft_set_plan needs to > > be bumped accordingly. > > > > Also use ksft_finished() to print results and exit. This will catch future > > mismatches between ksft_set_plan() and the number of tests being run. > > > > Fixes: 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > > Cc: Christian Brauner <brauner@kernel.org> > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > > --- > > Looks good. Thanks for fixing this, > Reviewed-by: Christian Brauner <brauner@kernel.org> > > Feel free to take this through the selftests tree, Shuah. It looks like this hasn't made it into Linus' tree yet and I also don't see it in Shuah's tree. Would it be possible to still submit this for 6.3-rc6 given the commit it fixes has made it to Linus' tree already? Thanks
On Mon, Apr 03, 2023 at 10:57:37PM +0200, Tobias Klauser wrote: > On 2023-03-14 at 14:09:59 +0100, Christian Brauner <brauner@kernel.org> wrote: > > On Tue, Mar 14, 2023 at 01:34:14PM +0100, Tobias Klauser wrote: > > > Commit 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > > > added an additional test, so the number passed to ksft_set_plan needs to > > > be bumped accordingly. > > > > > > Also use ksft_finished() to print results and exit. This will catch future > > > mismatches between ksft_set_plan() and the number of tests being run. > > > > > > Fixes: 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > > > Cc: Christian Brauner <brauner@kernel.org> > > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > > > --- > > > > Looks good. Thanks for fixing this, > > Reviewed-by: Christian Brauner <brauner@kernel.org> > > > > Feel free to take this through the selftests tree, Shuah. > > It looks like this hasn't made it into Linus' tree yet and I also don't > see it in Shuah's tree. Would it be possible to still submit this for > 6.3-rc6 given the commit it fixes has made it to Linus' tree already? Is it in linux-next?
On 2023-04-05 at 09:46:11 +0200, Christian Brauner <brauner@kernel.org> wrote: > On Mon, Apr 03, 2023 at 10:57:37PM +0200, Tobias Klauser wrote: > > On 2023-03-14 at 14:09:59 +0100, Christian Brauner <brauner@kernel.org> wrote: > > > On Tue, Mar 14, 2023 at 01:34:14PM +0100, Tobias Klauser wrote: > > > > Commit 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > > > > added an additional test, so the number passed to ksft_set_plan needs to > > > > be bumped accordingly. > > > > > > > > Also use ksft_finished() to print results and exit. This will catch future > > > > mismatches between ksft_set_plan() and the number of tests being run. > > > > > > > > Fixes: 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") > > > > Cc: Christian Brauner <brauner@kernel.org> > > > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > > > > --- > > > > > > Looks good. Thanks for fixing this, > > > Reviewed-by: Christian Brauner <brauner@kernel.org> > > > > > > Feel free to take this through the selftests tree, Shuah. > > > > It looks like this hasn't made it into Linus' tree yet and I also don't > > see it in Shuah's tree. Would it be possible to still submit this for > > 6.3-rc6 given the commit it fixes has made it to Linus' tree already? > > Is it in linux-next? No, doesn't look like it (I checked on tags/next-20230405).
diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selftests/clone3/clone3.c index 4fce46afe6db..e495f895a2cd 100644 --- a/tools/testing/selftests/clone3/clone3.c +++ b/tools/testing/selftests/clone3/clone3.c @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) uid_t uid = getuid(); ksft_print_header(); - ksft_set_plan(17); + ksft_set_plan(18); test_clone3_supported(); /* Just a simple clone3() should return 0.*/ @@ -198,5 +198,5 @@ int main(int argc, char *argv[]) /* Do a clone3() in a new time namespace */ test_clone3(CLONE_NEWTIME, 0, 0, CLONE3_ARGS_NO_TEST); - return !ksft_get_fail_cnt() ? ksft_exit_pass() : ksft_exit_fail(); + ksft_finished(); }
Commit 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") added an additional test, so the number passed to ksft_set_plan needs to be bumped accordingly. Also use ksft_finished() to print results and exit. This will catch future mismatches between ksft_set_plan() and the number of tests being run. Fixes: 515bddf0ec41 ("selftests/clone3: test clone3 with CLONE_NEWTIME") Cc: Christian Brauner <brauner@kernel.org> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- v2: - actually added ksft_finished call as mentioned in the commit message tools/testing/selftests/clone3/clone3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)