Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove intel_vsec check from telemetry tests #387

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Remove intel_vsec check from telemetry tests #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions BM/telemetry/telemetry_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,20 @@ pci_test() {
do_cmd "lspci -knnv | grep -c intel_vsec"
}

pre_unload_driver() {
rmmod intel_pmc_core
rmmod intel_rapl_tpmi
rmmod isst_tpmi
rmmod isst_tpmi_core
rmmod intel_uncore_frequency_tpmi
rmmod intel_vsec_tpmi
unload_module() {
# $1 is the driver module name
local module_name=$1
is_kmodule_builtin "$module_name" && skip_test
load_unload_module.sh -c -d "$module_name" &&
do_cmd "load_unload_module.sh -u -d $module_name"
}

driver_test() {
module=$1
pre_unload_driver
load_unload_module.sh -c -d "$module" &&
do_cmd "load_unload_module.sh -u -d $module"
do_cmd "load_unload_module.sh -l -d $module"
sleep 5
pre_unload_driver
do_cmd "load_unload_module.sh -u -d $module"
do_cmd "load_unload_module.sh -l -d $module"
load_module() {
# $1 is the driver module name
local module_name=$1
is_kmodule_builtin "$module_name" && skip_test
do_cmd "load_unload_module.sh -l -d $module_name" &&
load_unload_module.sh -c -d "$module_name"
}

dmesg_check() {
Expand All @@ -107,10 +102,10 @@ telemetry_test() {
pci_test
;;
telem_driver)
driver_test "pmt_telemetry"
;;
pci_driver)
driver_test "intel_vsec"
unload_module pmt_telemetry
unload_module pmt_class
load_module pmt_class
load_module pmt_telemetry
;;
esac
dmesg_check
Expand Down
1 change: 0 additions & 1 deletion BM/telemetry/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This file collects the telemetry cases
telemetry_tests.sh -t pci
telemetry_tests.sh -t pci_driver
telemetry_tests.sh -t telem_driver
telemetry_tests.sh -t telem_sysfs
telemetry_tests.sh -t telem_dev
Expand Down
7 changes: 0 additions & 7 deletions scenario/emr-oe/tests-telemetry
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions scenario/emr-oe/tests-telemetry
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../BM/telemetry/tests
7 changes: 0 additions & 7 deletions scenario/spr-oe/tests-telemetry
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions scenario/spr-oe/tests-telemetry
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../BM/telemetry/tests
7 changes: 0 additions & 7 deletions scenario/srf-oe/tests-telemetry
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions scenario/srf-oe/tests-telemetry
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../BM/telemetry/tests
Loading