mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
test_sysctl: Fix test metadata getters
The functions get_test_{count,enabled,target} use awk to get the N'th field in the ALL_TESTS variable. A variable with leading zeros (e.g. 0009) is misinterpreted as an entire line instead of the N'th field. Remove the leading zeros so this does not happen. We can now use the helper in tests 6, 7 and 8. Signed-off-by: Joel Granados <j.granados@samsung.com> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
parent
37e9981e33
commit
a40b702789
1 changed files with 13 additions and 6 deletions
|
@ -730,7 +730,7 @@ sysctl_test_0005()
|
|||
|
||||
sysctl_test_0006()
|
||||
{
|
||||
TARGET="${SYSCTL}/bitmap_0001"
|
||||
TARGET="${SYSCTL}/$(get_test_target 0006)"
|
||||
reset_vals
|
||||
ORIG=""
|
||||
run_bitmaptest
|
||||
|
@ -738,7 +738,7 @@ sysctl_test_0006()
|
|||
|
||||
sysctl_test_0007()
|
||||
{
|
||||
TARGET="${SYSCTL}/boot_int"
|
||||
TARGET="${SYSCTL}/$(get_test_target 0007)"
|
||||
if [ ! -f $TARGET ]; then
|
||||
echo "Skipping test for $TARGET as it is not present ..."
|
||||
return $ksft_skip
|
||||
|
@ -778,7 +778,7 @@ sysctl_test_0007()
|
|||
|
||||
sysctl_test_0008()
|
||||
{
|
||||
TARGET="${SYSCTL}/match_int"
|
||||
TARGET="${SYSCTL}/$(get_test_target 0008)"
|
||||
if [ ! -f $TARGET ]; then
|
||||
echo "Skipping test for $TARGET as it is not present ..."
|
||||
return $ksft_skip
|
||||
|
@ -857,25 +857,32 @@ function test_num()
|
|||
usage
|
||||
fi
|
||||
}
|
||||
function remove_leading_zeros()
|
||||
{
|
||||
echo $1 | sed 's/^0*//'
|
||||
}
|
||||
|
||||
function get_test_count()
|
||||
{
|
||||
test_num $1
|
||||
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}')
|
||||
awk_field=$(remove_leading_zeros $1)
|
||||
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$awk_field'}')
|
||||
echo ${TEST_DATA} | awk -F":" '{print $2}'
|
||||
}
|
||||
|
||||
function get_test_enabled()
|
||||
{
|
||||
test_num $1
|
||||
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}')
|
||||
awk_field=$(remove_leading_zeros $1)
|
||||
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$awk_field'}')
|
||||
echo ${TEST_DATA} | awk -F":" '{print $3}'
|
||||
}
|
||||
|
||||
function get_test_target()
|
||||
{
|
||||
test_num $1
|
||||
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}')
|
||||
awk_field=$(remove_leading_zeros $1)
|
||||
TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$awk_field'}')
|
||||
echo ${TEST_DATA} | awk -F":" '{print $4}'
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue