From b83788993bb2aeb2a6074ac8a2a08d4b9e49102b Mon Sep 17 00:00:00 2001 From: Craig Small Date: Wed, 31 Jul 2013 21:54:53 +1000 Subject: [PATCH] Conditional test vmstat -p --- testsuite/vmstat.test/vmstat.exp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp index 328e2fc5..76ea310d 100644 --- a/testsuite/vmstat.test/vmstat.exp +++ b/testsuite/vmstat.test/vmstat.exp @@ -31,9 +31,10 @@ expect_pass "$test" "^disk\[ -\]+reads\[ -\]+writes\[ -\]+IO\[ -\]+\\s+total\\s+ # Need a partition set diskstats [ exec cat /proc/diskstats ] -regexp "\\s+\\d+\\s+\\d+\\s+\(\[a-z\]+\\d+\)\\s+\(\[0-9\]\[0-9\]+\)" $diskstats -> partition -set test "vmstat partition (using $partition)" -spawn $vmstat -p $partition -expect_pass "$test" "^${partition}\\s+reads" -#\\s+read sectors\\s+writes\\s+requested writes" -#\(\\s+\\d+\){4}\\s*$" +if [ regexp "\\s+\\d+\\s+\\d+\\s+\(\[a-z\]+\\d+\)\\s+\[0-9\]\[0-9\]+" $diskstats line partition == 1 ] { + set test "vmstat partition (using $partition)" + spawn $vmstat -p $partition + expect_pass "$test" "^${partition}\\s+reads" +} else { + unsupported "vmstat partition (cannot find partition)" +}