| Message ID | 20190405015859.32755-3-tobin@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d3460527706eaacae0b24889885570d85cc0869a |
| Headers | show |
| Series | lib/string: Add strscpy_pad() function | expand |
Hi Tobin, On Fri, 5 Apr 2019 at 07:30, Tobin C. Harding <tobin@kernel.org> wrote: > > Currently if we wish to use kselftest to run tests within a kernel > module we write a small script to load/unload and do error reporting. > There are a bunch of these under tools/testing/selftests/lib/ that are > all identical except for the test name. We can reduce code duplication > and improve maintainability if we have one version of this. However > kselftest requires an executable for each test. We can move all the > script logic to a central script then have each individual test script > call the main script. > > Oneliner to call kselftest_module.sh courtesy of Kees, thanks! > > Add test runner creation script. Convert > tools/testing/selftests/lib/*.sh to use new test creation script. > > Testing > ------- > > Configure kselftests for lib/ then build and boot kernel. Then run > kselftests as follows: > > $ cd /path/to/kernel/tree > $ sudo make O=$output_path -C tools/testing/selftests TARGETS="lib" run_tests We are missing "kselftest_module.sh" file when we do "make install" and followed by generating a tar file "gen_kselftest_tar.sh" and copying that on to target device and running tests by using "run_kselftest.sh" script file on the target. Could you install the supporting script file "kselftest_module.sh" ? Error log, ------------- # selftests lib printf.sh lib: printf.sh_ # # ./printf.sh line 4 ./../kselftest_module.sh No such file or directory line: 4_./../kselftest_module.sh # [FAIL] 1 selftests lib printf.sh # exit=127 selftests: lib_printf.sh [FAIL] # selftests lib bitmap.sh lib: bitmap.sh_ # # ./bitmap.sh line 3 ./../kselftest_module.sh No such file or directory line: 3_./../kselftest_module.sh # [FAIL] 2 selftests lib bitmap.sh # exit=127 selftests: lib_bitmap.sh [FAIL] # selftests lib prime_numbers.sh lib: prime_numbers.sh_ # # ./prime_numbers.sh line 4 ./../kselftest_module.sh No such file or directory line: 4_./../kselftest_module.sh # [FAIL] 3 selftests lib prime_numbers.sh # exit=127 selftests: lib_prime_numbers.sh [FAIL] # selftests lib strscpy.sh lib: strscpy.sh_ # # ./strscpy.sh line 3 ./../kselftest_module.sh No such file or directory line: 3_./../kselftest_module.sh # [FAIL] 4 selftests lib strscpy.sh # exit=127 selftests: lib_strscpy.sh [FAIL] - Naresh
On Wed, Oct 30, 2019 at 06:15:22PM +0530, Naresh Kamboju wrote: > Hi Tobin, > > On Fri, 5 Apr 2019 at 07:30, Tobin C. Harding <tobin@kernel.org> wrote: > > > > Currently if we wish to use kselftest to run tests within a kernel > > module we write a small script to load/unload and do error reporting. > > There are a bunch of these under tools/testing/selftests/lib/ that are > > all identical except for the test name. We can reduce code duplication > > and improve maintainability if we have one version of this. However > > kselftest requires an executable for each test. We can move all the > > script logic to a central script then have each individual test script > > call the main script. > > > > Oneliner to call kselftest_module.sh courtesy of Kees, thanks! > > > > Add test runner creation script. Convert > > tools/testing/selftests/lib/*.sh to use new test creation script. > > > > Testing > > ------- > > > > Configure kselftests for lib/ then build and boot kernel. Then run > > kselftests as follows: > > > > $ cd /path/to/kernel/tree > > $ sudo make O=$output_path -C tools/testing/selftests TARGETS="lib" run_tests > > We are missing "kselftest_module.sh" file when we do "make install" > and followed by generating a tar file "gen_kselftest_tar.sh" and > copying that on to target device and running tests by using > "run_kselftest.sh" script file on the target. Yikes -- there's a problem with gen_kselftest_tar.sh using the wrong directory. I'll send a patch... -Kees > > Could you install the supporting script file "kselftest_module.sh" ? > > Error log, > ------------- > # selftests lib printf.sh > lib: printf.sh_ # > # ./printf.sh line 4 ./../kselftest_module.sh No such file or directory > line: 4_./../kselftest_module.sh # > [FAIL] 1 selftests lib printf.sh # exit=127 > selftests: lib_printf.sh [FAIL] > # selftests lib bitmap.sh > lib: bitmap.sh_ # > # ./bitmap.sh line 3 ./../kselftest_module.sh No such file or directory > line: 3_./../kselftest_module.sh # > [FAIL] 2 selftests lib bitmap.sh # exit=127 > selftests: lib_bitmap.sh [FAIL] > # selftests lib prime_numbers.sh > lib: prime_numbers.sh_ # > # ./prime_numbers.sh line 4 ./../kselftest_module.sh No such file or directory > line: 4_./../kselftest_module.sh # > [FAIL] 3 selftests lib prime_numbers.sh # exit=127 > selftests: lib_prime_numbers.sh [FAIL] > # selftests lib strscpy.sh > lib: strscpy.sh_ # > # ./strscpy.sh line 3 ./../kselftest_module.sh No such file or directory > line: 3_./../kselftest_module.sh # > [FAIL] 4 selftests lib strscpy.sh # exit=127 > selftests: lib_strscpy.sh [FAIL] > > - Naresh
diff --git a/tools/testing/selftests/kselftest_module.sh b/tools/testing/selftests/kselftest_module.sh new file mode 100755 index 000000000000..18e1c7992d30 --- /dev/null +++ b/tools/testing/selftests/kselftest_module.sh @@ -0,0 +1,84 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0+ + +# +# Runs an individual test module. +# +# kselftest expects a separate executable for each test, this can be +# created by adding a script like this: +# +# #!/bin/sh +# SPDX-License-Identifier: GPL-2.0+ +# $(dirname $0)/../kselftest_module.sh "description" module_name +# +# Example: tools/testing/selftests/lib/printf.sh + +desc="" # Output prefix. +module="" # Filename (without the .ko). +args="" # modprobe arguments. + +modprobe="/sbin/modprobe" + +main() { + parse_args "$@" + assert_root + assert_have_module + run_module +} + +parse_args() { + script=${0##*/} + + if [ $# -lt 2 ]; then + echo "Usage: $script <description> <module_name> [FAIL]" + exit 1 + fi + + desc="$1" + shift || true + module="$1" + shift || true + args="$@" +} + +assert_root() { + if [ ! -w /dev ]; then + skip "please run as root" + fi +} + +assert_have_module() { + if ! $modprobe -q -n $module; then + skip "module $module is not found" + fi +} + +run_module() { + if $modprobe -q $module $args; then + $modprobe -q -r $module + say "ok" + else + fail "" + fi +} + +say() { + echo "$desc: $1" +} + + +fail() { + say "$1 [FAIL]" >&2 + exit 1 +} + +skip() { + say "$1 [SKIP]" >&2 + # Kselftest framework requirement - SKIP code is 4. + exit 4 +} + +# +# Main script +# +main "$@" diff --git a/tools/testing/selftests/lib/bitmap.sh b/tools/testing/selftests/lib/bitmap.sh index 5a90006d1aea..5511dddc5c2d 100755 --- a/tools/testing/selftests/lib/bitmap.sh +++ b/tools/testing/selftests/lib/bitmap.sh @@ -1,19 +1,3 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 - -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 - -# 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 - -if /sbin/modprobe -q test_bitmap; then - /sbin/modprobe -q -r test_bitmap - echo "bitmap: ok" -else - echo "bitmap: [FAIL]" - exit 1 -fi +$(dirname $0)/../kselftest_module.sh "bitmap" test_bitmap diff --git a/tools/testing/selftests/lib/prime_numbers.sh b/tools/testing/selftests/lib/prime_numbers.sh index 78e7483c8d60..43b28f24e453 100755 --- a/tools/testing/selftests/lib/prime_numbers.sh +++ b/tools/testing/selftests/lib/prime_numbers.sh @@ -1,19 +1,4 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # Checks fast/slow prime_number generation for inconsistencies - -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 - -if ! /sbin/modprobe -q -n prime_numbers; then - echo "prime_numbers: module prime_numbers is not found [SKIP]" - exit $ksft_skip -fi - -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 -fi +$(dirname $0)/../kselftest_module.sh "prime numbers" prime_numbers selftest=65536 diff --git a/tools/testing/selftests/lib/printf.sh b/tools/testing/selftests/lib/printf.sh index 45a23e2d64ad..2ffa61da0296 100755 --- a/tools/testing/selftests/lib/printf.sh +++ b/tools/testing/selftests/lib/printf.sh @@ -1,19 +1,4 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 -# Runs printf infrastructure using test_printf kernel module - -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 - -if ! /sbin/modprobe -q -n test_printf; then - echo "printf: module test_printf is not found [SKIP]" - exit $ksft_skip -fi - -if /sbin/modprobe -q test_printf; then - /sbin/modprobe -q -r test_printf - echo "printf: ok" -else - echo "printf: [FAIL]" - exit 1 -fi +# Tests the printf infrastructure using test_printf kernel module. +$(dirname $0)/../kselftest_module.sh "printf" test_printf