From: keescook at chromium.org (Kees Cook) Subject: [PATCH v3 3/7] kselftest/lib: Use new shell runner to define tests Date: Tue, 2 Apr 2019 14:29:31 -0700 [thread overview] Message-ID: <CAGXu5j+OPGL3N95cxRWDm5zi=ZpyEH5qA4==UdedYqWr_yi6GQ@mail.gmail.com> (raw) In-Reply-To: <20190306214226.14598-4-tobin@kernel.org> On Wed, Mar 6, 2019 at 1:43 PM Tobin C. Harding <tobin at kernel.org> wrote: > > We just added a new script kselftest_module.sh that can be used to > define kselftest tests that run tests within a kernel module. We can > use it to reduce code duplication in all of the test runner scripts in > tools/testing/selftests/lib/. > > Use new shell runner tools/testing/selftests/kselftest_module.sh to > define test runner scripts. > > Signed-off-by: Tobin C. Harding <tobin at kernel.org> > --- > tools/testing/selftests/lib/bitmap.sh | 25 ++++++++++---------- > tools/testing/selftests/lib/prime_numbers.sh | 23 +++++++++--------- > tools/testing/selftests/lib/printf.sh | 25 ++++++++++---------- > 3 files changed, 35 insertions(+), 38 deletions(-) > > diff --git a/tools/testing/selftests/lib/bitmap.sh b/tools/testing/selftests/lib/bitmap.sh > index 5a90006d1aea..ed4180ea0021 100755 > --- a/tools/testing/selftests/lib/bitmap.sh > +++ b/tools/testing/selftests/lib/bitmap.sh > @@ -1,19 +1,18 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > > -# Kselftest framework requirement - SKIP code is 4. > -ksft_skip=4 > +module=test_bitmap > +description="bitmap" > > -# Runs bitmap infrastructure tests using test_bitmap kernel module > -if ! /sbin/modprobe -q -n test_bitmap; then > - echo "bitmap: module test_bitmap is not found [SKIP]" > - exit $ksft_skip > -fi > +# > +# Shouldn't need to edit anything below here. > +# > > -if /sbin/modprobe -q test_bitmap; then > - /sbin/modprobe -q -r test_bitmap > - echo "bitmap: ok" > -else > - echo "bitmap: [FAIL]" > - exit 1 > +file="kselftest_module.sh" > +path="../$file" > +if [[ ! $KBUILD_SRC == "" ]]; then > + path="${KBUILD_SRC}/tools/testing/selftests/$file" > fi Can this just be reduced to something like: . $(dirname $0)/../kselftest_module.sh call_functions_here ... > + > +$path $module $description > + > diff --git a/tools/testing/selftests/lib/prime_numbers.sh b/tools/testing/selftests/lib/prime_numbers.sh > index 78e7483c8d60..6f782386d897 100755 > --- a/tools/testing/selftests/lib/prime_numbers.sh > +++ b/tools/testing/selftests/lib/prime_numbers.sh > @@ -2,18 +2,17 @@ > # SPDX-License-Identifier: GPL-2.0 > # Checks fast/slow prime_number generation for inconsistencies > > -# Kselftest framework requirement - SKIP code is 4. > -ksft_skip=4 > +module=prime_numbers > +description="prime_numbers" > > -if ! /sbin/modprobe -q -n prime_numbers; then > - echo "prime_numbers: module prime_numbers is not found [SKIP]" > - exit $ksft_skip > -fi > +# > +# Shouldn't need to edit anything below here. > +# > > -if /sbin/modprobe -q prime_numbers selftest=65536; then > - /sbin/modprobe -q -r prime_numbers > - echo "prime_numbers: ok" > -else > - echo "prime_numbers: [FAIL]" > - exit 1 > +file="kselftest_module.sh" > +path="../$file" > +if [[ ! $KBUILD_SRC == "" ]]; then > + path="${KBUILD_SRC}/tools/testing/selftests/$file" > fi > + > +$path $module $description > diff --git a/tools/testing/selftests/lib/printf.sh b/tools/testing/selftests/lib/printf.sh > index 45a23e2d64ad..89717915d028 100755 > --- a/tools/testing/selftests/lib/printf.sh > +++ b/tools/testing/selftests/lib/printf.sh > @@ -1,19 +1,18 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > -# Runs printf infrastructure using test_printf kernel module > +# Tests the printf infrastructure using test_printf kernel module. > > -# Kselftest framework requirement - SKIP code is 4. > -ksft_skip=4 > +module=test_printf > +description="printf" > > -if ! /sbin/modprobe -q -n test_printf; then > - echo "printf: module test_printf is not found [SKIP]" > - exit $ksft_skip > -fi > +# > +# Shouldn't need to edit anything below here. > +# > > -if /sbin/modprobe -q test_printf; then > - /sbin/modprobe -q -r test_printf > - echo "printf: ok" > -else > - echo "printf: [FAIL]" > - exit 1 > +file="kselftest_module.sh" > +path="../$file" > +if [[ ! $KBUILD_SRC == "" ]]; then > + path="${KBUILD_SRC}/tools/testing/selftests/$file" > fi > + > +$path $module $description > -- > 2.20.1 > -- Kees Cook
WARNING: multiple messages have this Message-ID (diff)
From: keescook@chromium.org (Kees Cook) Subject: [PATCH v3 3/7] kselftest/lib: Use new shell runner to define tests Date: Tue, 2 Apr 2019 14:29:31 -0700 [thread overview] Message-ID: <CAGXu5j+OPGL3N95cxRWDm5zi=ZpyEH5qA4==UdedYqWr_yi6GQ@mail.gmail.com> (raw) Message-ID: <20190402212931.hsJKiyzeig-Vm_KVIG1wj9TTktQhlZNdwneV2gWd_Ik@z> (raw) In-Reply-To: <20190306214226.14598-4-tobin@kernel.org> On Wed, Mar 6, 2019@1:43 PM Tobin C. Harding <tobin@kernel.org> wrote: > > We just added a new script kselftest_module.sh that can be used to > define kselftest tests that run tests within a kernel module. We can > use it to reduce code duplication in all of the test runner scripts in > tools/testing/selftests/lib/. > > Use new shell runner tools/testing/selftests/kselftest_module.sh to > define test runner scripts. > > Signed-off-by: Tobin C. Harding <tobin at kernel.org> > --- > tools/testing/selftests/lib/bitmap.sh | 25 ++++++++++---------- > tools/testing/selftests/lib/prime_numbers.sh | 23 +++++++++--------- > tools/testing/selftests/lib/printf.sh | 25 ++++++++++---------- > 3 files changed, 35 insertions(+), 38 deletions(-) > > diff --git a/tools/testing/selftests/lib/bitmap.sh b/tools/testing/selftests/lib/bitmap.sh > index 5a90006d1aea..ed4180ea0021 100755 > --- a/tools/testing/selftests/lib/bitmap.sh > +++ b/tools/testing/selftests/lib/bitmap.sh > @@ -1,19 +1,18 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > > -# Kselftest framework requirement - SKIP code is 4. > -ksft_skip=4 > +module=test_bitmap > +description="bitmap" > > -# Runs bitmap infrastructure tests using test_bitmap kernel module > -if ! /sbin/modprobe -q -n test_bitmap; then > - echo "bitmap: module test_bitmap is not found [SKIP]" > - exit $ksft_skip > -fi > +# > +# Shouldn't need to edit anything below here. > +# > > -if /sbin/modprobe -q test_bitmap; then > - /sbin/modprobe -q -r test_bitmap > - echo "bitmap: ok" > -else > - echo "bitmap: [FAIL]" > - exit 1 > +file="kselftest_module.sh" > +path="../$file" > +if [[ ! $KBUILD_SRC == "" ]]; then > + path="${KBUILD_SRC}/tools/testing/selftests/$file" > fi Can this just be reduced to something like: . $(dirname $0)/../kselftest_module.sh call_functions_here ... > + > +$path $module $description > + > diff --git a/tools/testing/selftests/lib/prime_numbers.sh b/tools/testing/selftests/lib/prime_numbers.sh > index 78e7483c8d60..6f782386d897 100755 > --- a/tools/testing/selftests/lib/prime_numbers.sh > +++ b/tools/testing/selftests/lib/prime_numbers.sh > @@ -2,18 +2,17 @@ > # SPDX-License-Identifier: GPL-2.0 > # Checks fast/slow prime_number generation for inconsistencies > > -# Kselftest framework requirement - SKIP code is 4. > -ksft_skip=4 > +module=prime_numbers > +description="prime_numbers" > > -if ! /sbin/modprobe -q -n prime_numbers; then > - echo "prime_numbers: module prime_numbers is not found [SKIP]" > - exit $ksft_skip > -fi > +# > +# Shouldn't need to edit anything below here. > +# > > -if /sbin/modprobe -q prime_numbers selftest=65536; then > - /sbin/modprobe -q -r prime_numbers > - echo "prime_numbers: ok" > -else > - echo "prime_numbers: [FAIL]" > - exit 1 > +file="kselftest_module.sh" > +path="../$file" > +if [[ ! $KBUILD_SRC == "" ]]; then > + path="${KBUILD_SRC}/tools/testing/selftests/$file" > fi > + > +$path $module $description > diff --git a/tools/testing/selftests/lib/printf.sh b/tools/testing/selftests/lib/printf.sh > index 45a23e2d64ad..89717915d028 100755 > --- a/tools/testing/selftests/lib/printf.sh > +++ b/tools/testing/selftests/lib/printf.sh > @@ -1,19 +1,18 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > -# Runs printf infrastructure using test_printf kernel module > +# Tests the printf infrastructure using test_printf kernel module. > > -# Kselftest framework requirement - SKIP code is 4. > -ksft_skip=4 > +module=test_printf > +description="printf" > > -if ! /sbin/modprobe -q -n test_printf; then > - echo "printf: module test_printf is not found [SKIP]" > - exit $ksft_skip > -fi > +# > +# Shouldn't need to edit anything below here. > +# > > -if /sbin/modprobe -q test_printf; then > - /sbin/modprobe -q -r test_printf > - echo "printf: ok" > -else > - echo "printf: [FAIL]" > - exit 1 > +file="kselftest_module.sh" > +path="../$file" > +if [[ ! $KBUILD_SRC == "" ]]; then > + path="${KBUILD_SRC}/tools/testing/selftests/$file" > fi > + > +$path $module $description > -- > 2.20.1 > -- Kees Cook
next prev parent reply other threads:[~2019-04-02 21:29 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-06 21:42 [PATCH v3 0/7] lib/string: Add strscpy_pad() function tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-03-06 21:42 ` [PATCH v3 1/7] lib/test_printf: Add empty module_exit function tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-04-02 21:24 ` keescook 2019-04-02 21:24 ` Kees Cook 2019-03-06 21:42 ` [PATCH v3 2/7] kselftest: Add test runner creation script tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-04-02 21:27 ` keescook 2019-04-02 21:27 ` Kees Cook 2019-04-02 21:33 ` rdunlap 2019-04-02 21:33 ` Randy Dunlap 2019-04-04 23:16 ` me 2019-04-04 23:16 ` Tobin C. Harding 2019-03-06 21:42 ` [PATCH v3 3/7] kselftest/lib: Use new shell runner to define tests tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-04-02 21:29 ` keescook [this message] 2019-04-02 21:29 ` Kees Cook 2019-04-02 21:45 ` keescook 2019-04-02 21:45 ` Kees Cook 2019-04-02 21:51 ` keescook 2019-04-02 21:51 ` Kees Cook 2019-03-06 21:42 ` [PATCH v3 4/7] kselftest: Add test module framework header tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-04-02 21:31 ` keescook 2019-04-02 21:31 ` Kees Cook 2019-03-06 21:42 ` [PATCH v3 5/7] lib: Use new kselftest header tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-04-02 21:32 ` keescook 2019-04-02 21:32 ` Kees Cook 2019-03-06 21:42 ` [PATCH v3 6/7] lib/string: Add strscpy_pad() function tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-04-02 21:35 ` keescook 2019-04-02 21:35 ` Kees Cook 2019-03-06 21:42 ` [PATCH v3 7/7] lib: Add test module for strscpy_pad tobin 2019-03-06 21:42 ` Tobin C. Harding 2019-04-02 21:36 ` keescook 2019-04-02 21:36 ` Kees Cook 2019-03-06 21:49 ` [PATCH v3 0/7] lib/string: Add strscpy_pad() function me 2019-03-06 21:49 ` Tobin C. Harding 2019-03-07 21:18 ` me 2019-03-07 21:18 ` Tobin C. Harding 2019-03-07 22:43 ` keescook 2019-03-07 22:43 ` Kees Cook 2019-03-08 5:23 ` me 2019-03-08 5:23 ` Tobin C. Harding 2019-03-08 16:18 ` keescook 2019-03-08 16:18 ` Kees Cook 2019-04-02 21:37 ` keescook 2019-04-02 21:37 ` Kees Cook 2019-04-03 0:25 ` me 2019-04-03 0:25 ` Tobin C. Harding 2019-04-03 0:29 ` shuah 2019-04-03 0:29 ` shuah
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAGXu5j+OPGL3N95cxRWDm5zi=ZpyEH5qA4==UdedYqWr_yi6GQ@mail.gmail.com' \ --to=linux-kselftest@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).