From 3ad8fd56edf0723c56575a4cf2e7d5defa77207c Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 6 Jan 2012 08:49:21 -0600 Subject: [PATCH] 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. --- testsuite/vmstat.test/vmstat.exp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp index aa1707fa..bd42bf8e 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 -- 2.40.0