[ndctl v3 PATCH 9/9] test/monitor.sh: Partially skip monitor test on ndtest

[Shivaprasad G Bhat <sbhat@linux.ibm.com>]

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 irrelevant 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>

---

Depends on the kernel patch posted at -
https://patchwork.kernel.org/project/linux-nvdimm/patch/165027233876.3035289.4353747702027907365.stgit@lep8c.aus.stglabs.ibm.com/
Depends on the ndctl monitor regression fix patch posted at -
https://patchwork.kernel.org/project/linux-nvdimm/patch/164750955519.2000193.16903542741359443926.stgit@LAPTOP-TBQTPII8/

Changelog:

Since v2:
Link: https://patchwork.kernel.org/project/linux-nvdimm/patch/163102905777.260256.5004593912307267155.stgit@99912bbcb4c7/
* Removing the entry from skip file as the test works on ndtest with the
  patch

 test/monitor.sh   |   11 ++++++++++-
 test/skip_PAPR.js |    3 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/monitor.sh b/test/monitor.sh
index 10e65374..7c5d316d 100755
--- a/test/monitor.sh
+++ b/test/monitor.sh
@@ -136,6 +136,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"
@@ -153,12 +157,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
 }
 
 _init
diff --git a/test/skip_PAPR.js b/test/skip_PAPR.js
index 97ceda82..52bb5f33 100644
--- a/test/skip_PAPR.js
+++ b/test/skip_PAPR.js
@@ -24,8 +24,7 @@
  "revoke_devmem",	//		""
  "align.sh",		//		""
  "dm.sh",		//		""
- "mmap.sh",		//		""
- "monitor.sh"		// To be fixed
+ "mmap.sh"		//		""
 ]
 
 // NOTE: The libjson-c doesn't like comments in json files, so keep the file