From: Craig Small <csmall@enc.com.au>
Date: Tue, 3 Dec 2013 11:08:30 +0000 (+1100)
Subject: Fixed check for vmstat with stolen time
X-Git-Tag: v3.3.9~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91ff7c6e22d0490168947e7e37827b27bbace24c;p=procps-ng

Fixed check for vmstat with stolen time

Commit a8a4a4f added stolen time to vmstat, but broke the checks as
we have another column. This commit fixes the checks
---

diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp
index 76ea310d..fb5de149 100644
--- a/testsuite/vmstat.test/vmstat.exp
+++ b/testsuite/vmstat.test/vmstat.exp
@@ -7,11 +7,11 @@ 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\\s*\(\\s+\\d+\){16}\\s*$"
+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\\s*\(\\s+\\d+\){16}\\s*$"
+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