summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/kselftest
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2020-07-25 00:36:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-25 13:05:20 +0300
commit4505e2154e8f3896da5ba63818082746b3026c59 (patch)
treefc44bcb3cc7bcb3dca484f4f72b0a5209f1c484c /tools/testing/selftests/kselftest
parent2d38dbf89a06d0f689daec9842c5d3295c49777f (diff)
downloadlinux-4505e2154e8f3896da5ba63818082746b3026c59.tar.xz
selftest/firmware: Add selftest timeout in settings
The firmware tests would always time out for me. Add a correct timeout, including details on how the value was reached. Additionally allow the test harness to skip comments in settings files and report how long a given timeout was. Reviewed-by: SeongJae Park <sjpark@amazon.de> Acked-by: Scott Branden <scott.branden@broadcom.com> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20200724213640.389191-3-keescook@chromium.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/kselftest')
-rw-r--r--tools/testing/selftests/kselftest/runner.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh
index 676b3a8b114d..cd5ddf979f15 100644
--- a/tools/testing/selftests/kselftest/runner.sh
+++ b/tools/testing/selftests/kselftest/runner.sh
@@ -53,6 +53,10 @@ run_one()
settings="$BASE_DIR/$DIR/settings"
if [ -r "$settings" ] ; then
while read line ; do
+ # Skip comments.
+ if echo "$line" | grep -q '^#'; then
+ continue
+ fi
field=$(echo "$line" | cut -d= -f1)
value=$(echo "$line" | cut -d= -f2-)
eval "kselftest_$field"="$value"
@@ -80,7 +84,7 @@ run_one()
echo "not ok $test_num $TEST_HDR_MSG # SKIP"
elif [ $rc -eq $timeout_rc ]; then \
echo "#"
- echo "not ok $test_num $TEST_HDR_MSG # TIMEOUT"
+ echo "not ok $test_num $TEST_HDR_MSG # TIMEOUT $kselftest_timeout seconds"
else
echo "not ok $test_num $TEST_HDR_MSG # exit=$rc"
fi)