lkml.org 
[lkml]   [2020]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 12/28] selftests: kmod: fix handling test numbers above 9
    Date
    From: Eric Biggers <ebiggers@google.com>

    [ Upstream commit 6d573a07528308eb77ec072c010819c359bebf6e ]

    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: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: Luis 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.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/kmod/kmod.sh | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    diff --git a/tools/testing/selftests/kmod/kmod.sh b/tools/testing/selftests/kmod/kmod.sh
    index 7956ea3be6675..eed5d5b81226b 100755
    --- a/tools/testing/selftests/kmod/kmod.sh
    +++ b/tools/testing/selftests/kmod/kmod.sh
    @@ -502,18 +502,23 @@ function test_num()
    fi
    }

    -function get_test_count()
    +function get_test_data()
    {
    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#*:*}
    echo ${LAST_TWO%:*}
    }

    function get_test_enabled()
    {
    - test_num $1
    - TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}')
    + TEST_DATA=$(get_test_data $1)
    echo ${TEST_DATA#*:*:}
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-18 16:49    [W:3.095 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site