mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Merge tag 'linux_kselftest-fixes-7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fixes from Shuah Khan: "Fixes run_fat_tests hang, false bashism in kprobe_non_uniq_symbol.tc, and ftrace invalid test skip" * tag 'linux_kselftest-fixes-7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/ftrace: Add missing spaces after ! in probe syntax tests tracing/selftests: Fix false bashism in kprobe_non_uniq_symbol.tc selftests/filesystems: Fix run_fat_tests hang
This commit is contained in:
@@ -15,6 +15,8 @@ BASE_DIR="$(dirname $0)"
|
||||
TMP_DIR="$(mktemp -d /tmp/fat_tests_tmp.XXXXXX)"
|
||||
IMG_PATH="${TMP_DIR}/fat.img"
|
||||
MNT_PATH="${TMP_DIR}/mnt"
|
||||
# Kselftest framework requirement - SKIP code is 4.
|
||||
ksft_skip=4
|
||||
|
||||
cleanup()
|
||||
{
|
||||
@@ -23,6 +25,17 @@ cleanup()
|
||||
}
|
||||
trap cleanup SIGINT SIGTERM EXIT
|
||||
|
||||
check_prereqs()
|
||||
{
|
||||
local msg="skip all tests:"
|
||||
local uid=$(id -u)
|
||||
|
||||
if [ $uid -ne 0 ]; then
|
||||
echo $msg must be run as root >&2
|
||||
exit $ksft_skip
|
||||
fi
|
||||
}
|
||||
|
||||
create_loopback()
|
||||
{
|
||||
touch "${IMG_PATH}"
|
||||
@@ -73,6 +86,7 @@ unmount_image()
|
||||
sudo umount "${MNT_PATH}" &> /dev/null
|
||||
}
|
||||
|
||||
check_prereqs
|
||||
create_loopback
|
||||
mount_image
|
||||
rename_exchange_test
|
||||
|
||||
@@ -33,7 +33,7 @@ check_error 'f vfs_read ^$stack10000' # BAD_STACK_NUM
|
||||
|
||||
check_error 'f vfs_read ^$arg10000' # BAD_ARG_NUM
|
||||
|
||||
if !grep -q 'kernel return probes support:' README; then
|
||||
if ! grep -q 'kernel return probes support:' README; then
|
||||
check_error 'f vfs_read $retval ^$arg1' # BAD_VAR
|
||||
fi
|
||||
check_error 'f vfs_read ^$none_var' # BAD_VAR
|
||||
@@ -100,7 +100,7 @@ if grep -q "<argname>" README; then
|
||||
check_error 'f vfs_read args=^$arg*' # BAD_VAR_ARGS
|
||||
check_error 'f vfs_read +0(^$arg*)' # BAD_VAR_ARGS
|
||||
check_error 'f vfs_read $arg* ^$arg*' # DOUBLE_ARGS
|
||||
if !grep -q 'kernel return probes support:' README; then
|
||||
if ! grep -q 'kernel return probes support:' README; then
|
||||
check_error 'f vfs_read%return ^$arg*' # NOFENTRY_ARGS
|
||||
fi
|
||||
check_error 'f vfs_read ^hoge' # NO_BTFARG
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
SYMBOL='init_once'
|
||||
|
||||
# We skip this test on kernel where SYMBOL is unique or does not exist.
|
||||
if [ "$(grep -c -E "[[:alnum:]]+ t ${SYMBOL}$" /proc/kallsyms)" -le '1' ]; then
|
||||
if [ "$(grep -c -E "[[:alnum:]]+ t ${SYMBOL}\$" /proc/kallsyms)" -le '1' ]; then
|
||||
exit_unsupported
|
||||
fi
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ if grep -q "<argname>" README; then
|
||||
check_error 'p vfs_read args=^$arg*' # BAD_VAR_ARGS
|
||||
check_error 'p vfs_read +0(^$arg*)' # BAD_VAR_ARGS
|
||||
check_error 'p vfs_read $arg* ^$arg*' # DOUBLE_ARGS
|
||||
if !grep -q 'kernel return probes support:' README; then
|
||||
if ! grep -q 'kernel return probes support:' README; then
|
||||
check_error 'r vfs_read ^$arg*' # NOFENTRY_ARGS
|
||||
fi
|
||||
check_error 'p vfs_read+20 ^$arg*' # NOFENTRY_ARGS
|
||||
|
||||
Reference in New Issue
Block a user