Commit 6d573a07 authored by Eric Biggers's avatar Eric Biggers Committed by Linus Torvalds

selftests: kmod: fix handling test numbers above 9

get_test_count() and get_test_enabled() were broken for test numbers
above 9 due to awk interpreting a field specification like '$0010' as
octal rather than decimal.  Fix it by stripping the leading zeroes.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jeff Vander Stoep <jeffv@google.com>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: NeilBrown <neilb@suse.com>
Link: http://lkml.kernel.org/r/20200318230515.171692-5-ebiggers@kernel.orgSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6e715825
...@@ -505,18 +505,23 @@ function test_num() ...@@ -505,18 +505,23 @@ function test_num()
fi fi
} }
function get_test_count() function get_test_data()
{ {
test_num $1 test_num $1
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}') local field_num=$(echo $1 | sed 's/^0*//')
echo $ALL_TESTS | awk '{print $'$field_num'}'
}
function get_test_count()
{
TEST_DATA=$(get_test_data $1)
LAST_TWO=${TEST_DATA#*:*} LAST_TWO=${TEST_DATA#*:*}
echo ${LAST_TWO%:*} echo ${LAST_TWO%:*}
} }
function get_test_enabled() function get_test_enabled()
{ {
test_num $1 TEST_DATA=$(get_test_data $1)
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}')
echo ${TEST_DATA#*:*:} echo ${TEST_DATA#*:*:}
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment