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
This commit is contained in:
Craig Small 2013-12-03 22:08:30 +11:00
parent 4c464acf28
commit 91ff7c6e22

View File

@ -7,11 +7,11 @@ set vmstat "${topdir}vmstat"
# Run vmstat with no arguments # Run vmstat with no arguments
set test "vmstat with no arguments" set test "vmstat with no arguments"
spawn $vmstat 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" set test "vmstat with -a flag"
spawn $vmstat -a 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" set test "vmstat fork option"
spawn $vmstat -f spawn $vmstat -f