mirror of
https://gitlab.com/procps-ng/procps.git
synced 2024-11-24 18:44:24 +08:00
Reduced partition type check
vmstat -p checks used to fail on systems with odd partition tables, including some Debian buildd servers. This change limits what sort of test partitions are used, otherwise the test is skipped. There probably are other valid partitions, these can be added later, if known.
This commit is contained in:
parent
0b3f63456a
commit
f4cc9720ee
@ -38,7 +38,7 @@ set diskstats [ exec cat /proc/diskstats ]
|
||||
if { [ file readable "/sys/block" ] == 0 } {
|
||||
unsupported "vmstat partition /sys/block not readable"
|
||||
} else {
|
||||
if [ regexp "\\s+\\d+\\s+\\d+\\s+\(\[a-z\]+\\d+\)\\s+\[0-9\]\[0-9\]+" $diskstats line partition == 1 ] {
|
||||
if [ regexp "\\s+\\d+\\s+\\d+\\s+\((?:hd|sd|vd)\[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"
|
||||
|
Loading…
Reference in New Issue
Block a user