summaryrefslogtreecommitdiff
path: root/testsuite/vmstat.test
diff options
context:
space:
mode:
authorJim Warner <james.warner@comcast.net>2012-01-06 08:49:21 -0600
committerCraig Small <csmall@enc.com.au>2012-01-14 00:04:46 +1100
commit3ad8fd56edf0723c56575a4cf2e7d5defa77207c (patch)
tree1bb6d370cfd755d51475d2977c7b1aa305fd1a72 /testsuite/vmstat.test
parent58a6c89cd1c99713fc89d3994b76f14b85bef824 (diff)
downloadprocps-ng-3ad8fd56edf0723c56575a4cf2e7d5defa77207c.tar.gz
vmstat: slabinfo (-m option) test disabled if not readable
The dejagnu tests for slabtop are skipped when "/proc/slabinfo" is unreadable due to permissions. This commit provides the same check for vmstat under its -m (slabinfo) option.
Diffstat (limited to 'testsuite/vmstat.test')
-rw-r--r--testsuite/vmstat.test/vmstat.exp5
1 files changed, 4 insertions, 1 deletions
diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp
index aa1707f..bd42bf8 100644
--- a/testsuite/vmstat.test/vmstat.exp
+++ b/testsuite/vmstat.test/vmstat.exp
@@ -17,10 +17,13 @@ set test "vmstat fork option"
spawn $vmstat -f
expect_pass "$test" "^\\s+\\d+ forks\\s*$"
+if { [ file readable "/proc/slabinfo" ] == 0 } {
+ unsupported "slabinfo (-m option) test disabled as /proc/slabinfo is unreadable"
+} else {
set test "vmstat slabinfo (-m option)"
spawn $vmstat -m
expect_pass "$test" "^Cache\\s+Num\\s+Total\\s+Size\\s+Pages\\s+\(\[\(\)A-Za-z0-9_-\]+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*\){1,}"
-
+}
set test "vmstat disk information (-d option)"
spawn $vmstat -d