From: Eric Biggers <ebiggers@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org,
Alexei Starovoitov <ast@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jeff Vander Stoep <jeffv@google.com>,
Jessica Yu <jeyu@kernel.org>, Kees Cook <keescook@chromium.org>,
Luis Chamberlain <mcgrof@kernel.org>, NeilBrown <neilb@suse.com>
Subject: [PATCH v3 4/5] selftests: kmod: fix handling test numbers above 9
Date: Sat, 14 Mar 2020 14:34:25 -0700 [thread overview]
Message-ID: <20200314213426.134866-5-ebiggers@kernel.org> (raw)
In-Reply-To: <20200314213426.134866-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
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.
Acked-by: Luis Chamberlain <mcgrof@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.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>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
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 8b944cf042f6c..315a43111e046 100755
--- a/tools/testing/selftests/kmod/kmod.sh
+++ b/tools/testing/selftests/kmod/kmod.sh
@@ -505,18 +505,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.25.1
next prev parent reply other threads:[~2020-03-15 2:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-14 21:34 [PATCH v3 0/5] module autoloading fixes and cleanups Eric Biggers
2020-03-14 21:34 ` [PATCH v3 1/5] kmod: make request_module() return an error when autoloading is disabled Eric Biggers
2020-03-18 16:03 ` Jessica Yu
2020-03-14 21:34 ` [PATCH v3 2/5] fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() Eric Biggers
2020-03-17 22:30 ` Sasha Levin
2020-03-18 15:09 ` Jessica Yu
2020-03-18 22:55 ` Eric Biggers
2020-03-18 15:43 ` Jessica Yu
2020-03-18 22:54 ` Eric Biggers
2020-03-14 21:34 ` [PATCH v3 3/5] docs: admin-guide: document the kernel.modprobe sysctl Eric Biggers
2020-03-14 21:34 ` Eric Biggers [this message]
2020-03-14 21:34 ` [PATCH v3 5/5] selftests: kmod: test disabling module autoloading Eric Biggers
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=20200314213426.134866-5-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jeffv@google.com \
--cc=jeyu@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=neilb@suse.com \
/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: link
Be 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).