From 6fa97afc2c9c98dba31aa3ebeefa2174a772c0f0 Mon Sep 17 00:00:00 2001 From: Pengfei Xu Date: Tue, 11 Jun 2024 11:51:33 +0800 Subject: [PATCH 1/5] umip/tests: comment umip 32bit test case as default. Now most of the Linux OS will not support 32bit app as default, so comment umip 32bit test case umip_exceptions_32 as default. Signed-off-by: Pengfei Xu --- BM/umip/tests | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BM/umip/tests b/BM/umip/tests index 52ed7814..2fea20db 100755 --- a/BM/umip/tests +++ b/BM/umip/tests @@ -4,7 +4,8 @@ # @other_dep: general_test.sh -t kconfig -k "CONFIG_X86_INTEL_UMIP|CONFIG_X86_UMIP=y" # @other_warn: -umip_exceptions_32 a +# Most of the Linux OS will not support 32bit, comment umip_exceptions_32 as default +#umip_exceptions_32 a umip_exceptions_64 a # Test sgdt sidt sldt smsw str should trigger #GP in proper kernel umip_test_basic_64 a From 6cbce1d719ca1c60f47c3d4c92d3cab5a45edf5a Mon Sep 17 00:00:00 2001 From: Pengfei Xu Date: Tue, 11 Jun 2024 12:19:20 +0800 Subject: [PATCH 2/5] ifs: update the case cmd name to avoid confusion Signed-off-by: Pengfei Xu --- BM/ifs/ifs_tests.sh | 2 +- BM/ifs/tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BM/ifs/ifs_tests.sh b/BM/ifs/ifs_tests.sh index 0e65bd5d..e5d7fa83 100755 --- a/BM/ifs/ifs_tests.sh +++ b/BM/ifs/ifs_tests.sh @@ -250,7 +250,7 @@ test_ifs() { list_cpus "$PROCESSOR" case $NAME in - "reload_ifs") + "reload_ifs_scan_image") modprobe -r "$IFS_NAME" enable_ifs_module # Load the batch diff --git a/BM/ifs/tests b/BM/ifs/tests index 3482254e..5deacedb 100755 --- a/BM/ifs/tests +++ b/BM/ifs/tests @@ -10,7 +10,7 @@ ifs_tests.sh -m 0 -p all -b 1 -n legacy_twice_run ifs_tests.sh -m 0 -p all -b 2 -n legacy_twice_run ifs_tests.sh -m 0 -p all -b 3 -n legacy_twice_run ifs_tests.sh -m 0 -p all -b 1 -n img_version -ifs_tests.sh -m 0 -p all -b 1 -n reload_ifs +ifs_tests.sh -m 0 -p all -b 1 -n reload_ifs_scan_image # ifs_1 array BIST(Board Integrated System Test), it works on EMR(Emerald Rapids) and future server ifs_tests.sh -m 1 -p all -n ifs_array_scan From b30f57d2a79e9a9cc22e9536cdfdc13b8921e9fe Mon Sep 17 00:00:00 2001 From: Pengfei Xu Date: Tue, 11 Jun 2024 14:46:01 +0800 Subject: [PATCH 3/5] runtests: will show dependency result after perform features tests Signed-off-by: Pengfei Xu --- BM/runtests | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BM/runtests b/BM/runtests index 19ef17b1..adcc9109 100755 --- a/BM/runtests +++ b/BM/runtests @@ -355,7 +355,9 @@ show_result() { [[ -z "$LOGFILE" ]] || cat "$SUMMRY_LOG" >> "$LOGFILE" cat "$SUMMRY_LOG" - echo "Dependence info in $DEP_LOG and runtests log in $LOGFILE" + echo "LKVS log $LOGFILE as above." + echo "The dependency info $DEP_LOG is as follows:" + cat "$DEP_LOG" } # runtests_cleanup to show test result. TODO: restore the env if needed From 5fb63dbbe8d2052661a1e4ea89069c0a3a7f6094 Mon Sep 17 00:00:00 2001 From: Pengfei Xu Date: Tue, 11 Jun 2024 15:12:05 +0800 Subject: [PATCH 4/5] runtests: add the total exection time in the end Signed-off-by: Pengfei Xu --- BM/runtests | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/BM/runtests b/BM/runtests index adcc9109..c0e85c18 100755 --- a/BM/runtests +++ b/BM/runtests @@ -17,6 +17,8 @@ NA="NA" DEP_EXIT=$PASS_CODE START_TIME="" +START_TIME_SEC="" +END_TIME_SEC="" SUMMRY_LOG="" readonly TESTS_SERVER="tests-server" TEST_FILES="" @@ -350,12 +352,17 @@ list_all_test_files() { } show_result() { + local execution_time="" + + END_TIME_SEC=$(date +%s) + # Will record execution time 1s if it's less than 1s. + execution_time=$((END_TIME_SEC - START_TIME_SEC + 1)) # Add the following print for the end of the case summary. echo "--------------------------------------------------------" >> "$SUMMRY_LOG" - + echo "LKVS log $LOGFILE as above. Execution time:${execution_time}s." >> "$SUMMRY_LOG" [[ -z "$LOGFILE" ]] || cat "$SUMMRY_LOG" >> "$LOGFILE" cat "$SUMMRY_LOG" - echo "LKVS log $LOGFILE as above." + echo "The dependency info $DEP_LOG is as follows:" cat "$DEP_LOG" } @@ -375,6 +382,7 @@ run_tests() { cat /dev/null > "$LOGFILE" START_TIME="$(date +%Y-%m-%d_%H-%M-%S)" + START_TIME_SEC=$(date +%s) SUMMRY_LOG="/tmp/lkvs_${START_TIME}_summary.log" echo "Test Start Time: $START_TIME" > "$SUMMRY_LOG" { From d1a5ca3888fdc673738e3d9421c77b46945b7903 Mon Sep 17 00:00:00 2001 From: Pengfei Xu Date: Tue, 11 Jun 2024 15:30:48 +0800 Subject: [PATCH 5/5] runtests: align the test result name with the following specific results Align the test result name with the following specific results. Signed-off-by: Pengfei Xu --- BM/runtests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BM/runtests b/BM/runtests index c0e85c18..81f2e5ac 100755 --- a/BM/runtests +++ b/BM/runtests @@ -387,8 +387,8 @@ run_tests() { echo "Test Start Time: $START_TIME" > "$SUMMRY_LOG" { echo "--------------------------------------------------------" - printf "%-76s%-11s%-12s%-8s\n" "Testcase" "Result" "Exit Value" "Duration" - printf "%-76s%-11s%-12s%-8s\n" "--------" "------" "----------" "--------" + printf "%-77s%-10s%-12s%-8s\n" "Testcase" "Result" "Exit Value" "Duration" + printf "%-77s%-10s%-12s%-8s\n" "--------" "------" "----------" "--------" } >> "$SUMMRY_LOG" init_dep_log "$DEP_LOG"