From e40b0060c2ccee78833ebe2b5810dd3ec3f61b46 Mon Sep 17 00:00:00 2001 From: "dmarc-noreply@freelists.org" Date: Wed, 6 May 2015 15:17:24 -0700 Subject: [PATCH] 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 Signed-off-by: Craig Small --- testsuite/vmstat.test/vmstat.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp index 35ffddb8..0bc00b4d 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)"