diff options
| author | dmarc-noreply@freelists.org <dmarc-noreply@freelists.org> | 2015-05-06 15:17:24 -0700 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2015-05-10 15:05:28 +1000 |
| commit | e40b0060c2ccee78833ebe2b5810dd3ec3f61b46 (patch) | |
| tree | bf5527830469dc72d789eea2e2b8798ce0ba2203 /testsuite | |
| parent | af6e264b46de25136b56d1c8178d4c03bb611c1c (diff) | |
| download | procps-ng-e40b0060c2ccee78833ebe2b5810dd3ec3f61b46.tar.gz | |
tests: slabinfo should not be too strict about slab names
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>
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/vmstat.test/vmstat.exp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp index 35ffddb..0bc00b4 100644 --- a/testsuite/vmstat.test/vmstat.exp +++ b/testsuite/vmstat.test/vmstat.exp @@ -22,7 +22,7 @@ if { [ file readable "/proc/slabinfo" ] == 0 } { } else { set test "vmstat slabinfo (-m option)" 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)" |