@@ -143,6 +143,10 @@ test_filter_dimmevent()
check_result "$monitor_dimms"
stop_monitor
+ if [ $NDCTL_TEST_FAMILY == "PAPR" ]; then
+ return
+ fi
+
inject_value=$($NDCTL list -H -d $monitor_dimms | jq -r .[]."health"."spares_threshold")
inject_value=$((inject_value - 1))
start_monitor "-d $monitor_dimms -D dimm-spares-remaining"
@@ -160,12 +164,17 @@ test_filter_dimmevent()
do_tests()
{
+ test_filter_dimmevent
+
+ if [ $NDCTL_TEST_FAMILY == "PAPR" ]; then
+ return
+ fi
+
test_filter_dimm
test_filter_bus
test_filter_region
test_filter_namespace
test_conf_file
- test_filter_dimmevent
}
modprobe nfit_test
The ndtest/papr pdsm has the unclean shutdown inject support. Rest of the tests in monitor.sh are injecting temperature, spares with thresholds and monitoring on them. These test cases are irrelavent on papr, skip them. Its convenient/cleaner to reorder the tests than selectively adding test environment checks for each of the tests. So, reordering to call the dimm events test first. Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com> --- test/monitor.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)