From 54fdbb19a27204751b8eb119f7740a295330850d Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@enc.com.au>
Date: Sat, 13 Jun 2015 15:13:39 +1000
Subject: [PATCH] Skip tests where /proc/vmstat unreadable

testsuite would fail if /proc/vmstat was unreadable.
Issue #3 brought up by Mike Frysinger.
test script explicitly checks to see if it is readable and
sets these tests to unsupported if not.
---
 testsuite/vmstat.test/vmstat.exp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp
index 0bc00b4d..b044903b 100644
--- a/testsuite/vmstat.test/vmstat.exp
+++ b/testsuite/vmstat.test/vmstat.exp
@@ -4,18 +4,24 @@
 
 set vmstat "${topdir}vmstat"
 
-# Run vmstat with no arguments
-set test "vmstat with no arguments"
-spawn $vmstat
-expect_pass "$test" "^procs\[ -\]+memory\[ -\]+swap\[ -\]+io\[ -\]+system\[ -\]+cpu\[ -\]+\\s*r\\s+b\\s+swpd\\s+free\\s+buff\\s+cache\\s+si\\s+so\\s+bi\\s+bo\\s+in\\s+cs us sy id wa st\\s*\(\\s+\\d+\){17}\\s*$"
+# Tests that need to see /proc/vmstat
+if { [ file readable "/proc/vmstat" ] == 0 } {
+    unsupported "vmstat with no arguments - /proc/vmstat is unreadable"
+    unsupported "vmstat with -a flag - /proc/vmstat is unreadable"
+    unsupported "vmstat fork option - /proc/vmstat is unreadable"
+} else {
+    set test "vmstat with no arguments"
+    spawn $vmstat
+    expect_pass "$test" "^procs\[ -\]+memory\[ -\]+swap\[ -\]+io\[ -\]+system\[ -\]+cpu\[ -\]+\\s*r\\s+b\\s+swpd\\s+free\\s+buff\\s+cache\\s+si\\s+so\\s+bi\\s+bo\\s+in\\s+cs us sy id wa st\\s*\(\\s+\\d+\){17}\\s*$"
 
-set test "vmstat with -a flag"
-spawn $vmstat -a
-expect_pass "$test" "^procs\[ -\]+memory\[ -\]+swap\[ -\]+io\[ -\]+system\[ -\]+cpu\[ -\]+\\s*r\\s+b\\s+swpd\\s+free\\s+inact\\s+active\\s+si\\s+so\\s+bi\\s+bo\\s+in\\s+cs us sy id wa st\\s*\(\\s+\\d+\){17}\\s*$"
+    set test "vmstat with -a flag"
+    spawn $vmstat -a
+    expect_pass "$test" "^procs\[ -\]+memory\[ -\]+swap\[ -\]+io\[ -\]+system\[ -\]+cpu\[ -\]+\\s*r\\s+b\\s+swpd\\s+free\\s+inact\\s+active\\s+si\\s+so\\s+bi\\s+bo\\s+in\\s+cs us sy id wa st\\s*\(\\s+\\d+\){17}\\s*$"
 
-set test "vmstat fork option"
-spawn $vmstat -f
-expect_pass "$test" "^\\s+\\d+ forks\\s*$"
+    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"