emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

tests: slabinfo should not be too strict about slab names

Browse Source 
Before this commit, the test checking `vmstat -m` (slabinfo) output uses
a fairly strict regular expression that only allows alphanumeric
characters and a few exceptions such as "_", "-", "(" and ")".

However, recent kernels use a wider range of characters, such as ">".
For instance, see this Linux commit which creates a "page->ptl" slab:
  https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/mm/memory.c?id=b35f1819acd9243a3ff7ad25b1fa8bd6bfe80fb2#n4283

Other patches for reporting slab usage per memcg include the names of
the cgroup in the slabinfo output, which can include additional
characters and use dots for abbreviation.

The check should not be so string, instead it could simply look for a
chain of non-whitespace characters and that should be enough.

Tested that `make check` is still working, including in some of the
environments where features that enable the additional slabinfo names.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
Signed-off-by: Craig Small <csmall@enc.com.au>
This commit is contained in:
dmarc-noreply@freelists.org 2015-05-06 15:17:24 -07:00 committed by Craig Small
parent af6e264b46
commit e40b0060c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testsuite/vmstat.test/vmstat.exp
View File

@ -22,7 +22,7 @@ if { [ file readable "/proc/slabinfo" ] == 0 } {
} else { } else {
set test "vmstat slabinfo (-m option)" set test "vmstat slabinfo (-m option)"
spawn $vmstat -m spawn $vmstat -m
expect_pass "$test" "^Cache\\s+Num\\s+Total\\s+Size\\s+Pages\\s+\(\[\(\)A-Za-z0-9_-\]+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*\){1,}" expect_pass "$test" "^Cache\\s+Num\\s+Total\\s+Size\\s+Pages\\s+\(\\S+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*\){1,}"
} }
set test "vmstat disk information (-d option)" set test "vmstat disk information (-d option)"