mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 07:31:29 +00:00
linux-kselftest-fixes-6.4-rc3
This Kselftest fixes update for Linux 6.4-rc3 consists of: - sgx test fix for false negatives. - ftrace output is hard to parses and it masks inappropriate skips etc. This fix addresses the problems by integrating with kselftest runner. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPZKym/RZuOCGeA/kCwJExA0NQxwFAmRlDzgACgkQCwJExA0N Qxzlfw//fc+Uq5hC2KUeVOiIAPYejEZ3+ToY+OUjaKvykWndMpYys5bCB68qERm8 vtgzYOKm04ovvnyh2jXzxYTjd8439qeRxr0Eybqc5HjiVDhyA1jm/pcsy3EDBf1+ 5QGjgIN2fK9rdv7TmyMHL8pSxLvYQfe2zMjLtULuHZWtjzIY98hh3zjA9mdnn3pK f2zqEJzu2lysTiwkhDF/yspOa1TymVp1W6dCVvfcxr5wJOWYtZaZyOTYNiCI3gX6 9Qy2fm4txPcsooNrwSEekXUIV669fet9vbQX5PF3pRDipxydarAAUUbTm1hOP4X+ 3YnKk9dx/Pg483Go/sGMhtf+/P3ZJlWj2YZSro+maULt8O1Jb8TGe1MB7myheiFc CiXj5duiG+WlwteF8WMsm58vjplgbnFAfyVZ+mumRhE1e4qLtjnc5YxSdNYoOHOF 40wI1Nebfwofh/qW7/ipn5tx7bN29UUSXRd26q1T4qF3KwKYaaj720lcisS7kBR0 gK8FFCdqroKilJ/Fj3e+AM3xqmlJxornj7EhQoAVtBZCsjN90Wyaw2gaCceABp+f lDAisdO00v/+fpVhWFjXy4Mww5t6MDsRxmE5gLGOS1QHZUV9/mV7H9e9gd9ix6mV GXYAeytvRrQQBCDEbOz1ax8SS3eA2MFVdbmMxHYn/gWVx6ClpL4= =DOlj -----END PGP SIGNATURE----- Merge tag 'linux-kselftest-fixes-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pull Kselftest fixes from Shuah Khan: - sgx test fix for false negatives - ftrace output is hard to parses and it masks inappropriate skips etc. This fix addresses the problems by integrating with kselftest runner * tag 'linux-kselftest-fixes-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/ftrace: Improve integration with kselftest runner selftests/sgx: Add "test_encl.elf" to TEST_FILES
This commit is contained in:
Linus Torvalds
commit
4d6d4c7f54
@ -1,7 +1,8 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
all:
|
||||
|
||||
TEST_PROGS := ftracetest
|
||||
TEST_PROGS_EXTENDED := ftracetest
|
||||
TEST_PROGS := ftracetest-ktap
|
||||
TEST_FILES := test.d settings
|
||||
EXTRA_CLEAN := $(OUTPUT)/logs/*
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ echo "Usage: ftracetest [options] [testcase(s)] [testcase-directory(s)]"
|
||||
echo " Options:"
|
||||
echo " -h|--help Show help message"
|
||||
echo " -k|--keep Keep passed test logs"
|
||||
echo " -K|--ktap Output in KTAP format"
|
||||
echo " -v|--verbose Increase verbosity of test messages"
|
||||
echo " -vv Alias of -v -v (Show all results in stdout)"
|
||||
echo " -vvv Alias of -v -v -v (Show all commands immediately)"
|
||||
@ -85,6 +86,10 @@ parse_opts() { # opts
|
||||
KEEP_LOG=1
|
||||
shift 1
|
||||
;;
|
||||
--ktap|-K)
|
||||
KTAP=1
|
||||
shift 1
|
||||
;;
|
||||
--verbose|-v|-vv|-vvv)
|
||||
if [ $VERBOSE -eq -1 ]; then
|
||||
usage "--console can not use with --verbose"
|
||||
@ -178,6 +183,7 @@ TEST_DIR=$TOP_DIR/test.d
|
||||
TEST_CASES=`find_testcases $TEST_DIR`
|
||||
LOG_DIR=$TOP_DIR/logs/`date +%Y%m%d-%H%M%S`/
|
||||
KEEP_LOG=0
|
||||
KTAP=0
|
||||
DEBUG=0
|
||||
VERBOSE=0
|
||||
UNSUPPORTED_RESULT=0
|
||||
@ -229,7 +235,7 @@ prlog() { # messages
|
||||
newline=
|
||||
shift
|
||||
fi
|
||||
printf "$*$newline"
|
||||
[ "$KTAP" != "1" ] && printf "$*$newline"
|
||||
[ "$LOG_FILE" ] && printf "$*$newline" | strip_esc >> $LOG_FILE
|
||||
}
|
||||
catlog() { #file
|
||||
@ -260,11 +266,11 @@ TOTAL_RESULT=0
|
||||
|
||||
INSTANCE=
|
||||
CASENO=0
|
||||
CASENAME=
|
||||
|
||||
testcase() { # testfile
|
||||
CASENO=$((CASENO+1))
|
||||
desc=`grep "^#[ \t]*description:" $1 | cut -f2- -d:`
|
||||
prlog -n "[$CASENO]$INSTANCE$desc"
|
||||
CASENAME=`grep "^#[ \t]*description:" $1 | cut -f2- -d:`
|
||||
}
|
||||
|
||||
checkreq() { # testfile
|
||||
@ -277,40 +283,68 @@ test_on_instance() { # testfile
|
||||
grep -q "^#[ \t]*flags:.*instance" $1
|
||||
}
|
||||
|
||||
ktaptest() { # result comment
|
||||
if [ "$KTAP" != "1" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
local result=
|
||||
if [ "$1" = "1" ]; then
|
||||
result="ok"
|
||||
else
|
||||
result="not ok"
|
||||
fi
|
||||
shift
|
||||
|
||||
local comment=$*
|
||||
if [ "$comment" != "" ]; then
|
||||
comment="# $comment"
|
||||
fi
|
||||
|
||||
echo $CASENO $result $INSTANCE$CASENAME $comment
|
||||
}
|
||||
|
||||
eval_result() { # sigval
|
||||
case $1 in
|
||||
$PASS)
|
||||
prlog " [${color_green}PASS${color_reset}]"
|
||||
ktaptest 1
|
||||
PASSED_CASES="$PASSED_CASES $CASENO"
|
||||
return 0
|
||||
;;
|
||||
$FAIL)
|
||||
prlog " [${color_red}FAIL${color_reset}]"
|
||||
ktaptest 0
|
||||
FAILED_CASES="$FAILED_CASES $CASENO"
|
||||
return 1 # this is a bug.
|
||||
;;
|
||||
$UNRESOLVED)
|
||||
prlog " [${color_blue}UNRESOLVED${color_reset}]"
|
||||
ktaptest 0 UNRESOLVED
|
||||
UNRESOLVED_CASES="$UNRESOLVED_CASES $CASENO"
|
||||
return $UNRESOLVED_RESULT # depends on use case
|
||||
;;
|
||||
$UNTESTED)
|
||||
prlog " [${color_blue}UNTESTED${color_reset}]"
|
||||
ktaptest 1 SKIP
|
||||
UNTESTED_CASES="$UNTESTED_CASES $CASENO"
|
||||
return 0
|
||||
;;
|
||||
$UNSUPPORTED)
|
||||
prlog " [${color_blue}UNSUPPORTED${color_reset}]"
|
||||
ktaptest 1 SKIP
|
||||
UNSUPPORTED_CASES="$UNSUPPORTED_CASES $CASENO"
|
||||
return $UNSUPPORTED_RESULT # depends on use case
|
||||
;;
|
||||
$XFAIL)
|
||||
prlog " [${color_green}XFAIL${color_reset}]"
|
||||
ktaptest 1 XFAIL
|
||||
XFAILED_CASES="$XFAILED_CASES $CASENO"
|
||||
return 0
|
||||
;;
|
||||
*)
|
||||
prlog " [${color_blue}UNDEFINED${color_reset}]"
|
||||
ktaptest 0 error
|
||||
UNDEFINED_CASES="$UNDEFINED_CASES $CASENO"
|
||||
return 1 # this must be a test bug
|
||||
;;
|
||||
@ -371,6 +405,7 @@ __run_test() { # testfile
|
||||
run_test() { # testfile
|
||||
local testname=`basename $1`
|
||||
testcase $1
|
||||
prlog -n "[$CASENO]$INSTANCE$CASENAME"
|
||||
if [ ! -z "$LOG_FILE" ] ; then
|
||||
local testlog=`mktemp $LOG_DIR/${CASENO}-${testname}-log.XXXXXX`
|
||||
else
|
||||
@ -405,6 +440,17 @@ run_test() { # testfile
|
||||
# load in the helper functions
|
||||
. $TEST_DIR/functions
|
||||
|
||||
if [ "$KTAP" = "1" ]; then
|
||||
echo "TAP version 13"
|
||||
|
||||
casecount=`echo $TEST_CASES | wc -w`
|
||||
for t in $TEST_CASES; do
|
||||
test_on_instance $t || continue
|
||||
casecount=$((casecount+1))
|
||||
done
|
||||
echo "1..${casecount}"
|
||||
fi
|
||||
|
||||
# Main loop
|
||||
for t in $TEST_CASES; do
|
||||
run_test $t
|
||||
@ -439,6 +485,17 @@ prlog "# of unsupported: " `echo $UNSUPPORTED_CASES | wc -w`
|
||||
prlog "# of xfailed: " `echo $XFAILED_CASES | wc -w`
|
||||
prlog "# of undefined(test bug): " `echo $UNDEFINED_CASES | wc -w`
|
||||
|
||||
if [ "$KTAP" = "1" ]; then
|
||||
echo -n "# Totals:"
|
||||
echo -n " pass:"`echo $PASSED_CASES | wc -w`
|
||||
echo -n " faii:"`echo $FAILED_CASES | wc -w`
|
||||
echo -n " xfail:"`echo $XFAILED_CASES | wc -w`
|
||||
echo -n " xpass:0"
|
||||
echo -n " skip:"`echo $UNTESTED_CASES $UNSUPPORTED_CASES | wc -w`
|
||||
echo -n " error:"`echo $UNRESOLVED_CASES $UNDEFINED_CASES | wc -w`
|
||||
echo
|
||||
fi
|
||||
|
||||
cleanup
|
||||
|
||||
# if no error, return 0
|
||||
|
||||
8
tools/testing/selftests/ftrace/ftracetest-ktap
Executable file
8
tools/testing/selftests/ftrace/ftracetest-ktap
Executable file
@ -0,0 +1,8 @@
|
||||
#!/bin/sh -e
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
#
|
||||
# ftracetest-ktap: Wrapper to integrate ftracetest with the kselftest runner
|
||||
#
|
||||
# Copyright (C) Arm Ltd., 2023
|
||||
|
||||
./ftracetest -K
|
||||
@ -17,6 +17,7 @@ ENCL_CFLAGS := -Wall -Werror -static -nostdlib -nostartfiles -fPIC \
|
||||
-fno-stack-protector -mrdrnd $(INCLUDES)
|
||||
|
||||
TEST_CUSTOM_PROGS := $(OUTPUT)/test_sgx
|
||||
TEST_FILES := $(OUTPUT)/test_encl.elf
|
||||
|
||||
ifeq ($(CAN_BUILD_X86_64), 1)
|
||||
all: $(TEST_CUSTOM_PROGS) $(OUTPUT)/test_encl.elf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user