From fb4644e6b703df9574359eccad2d72cdf413cc7f Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Tue, 4 Jul 2017 11:39:23 +0800 Subject: [PATCH] stats/kernel_selftests: remove sigaltstack_stat() for rencently kernel Previously, sigaltstack have not been enabled, so we need special logic to handle it. But rencently, this case is enabled, so we can remove this logic fix the following sigaltstack duplication ------------ lizhijian@inn:/result/kernel_selftests/defaults/lkp-hsw-ep4/debian-x86_64-2016-08-31.cgz/x86_64-rhel-7.2/gcc-6/c0bc126f97fb929b3ae02c1c62322645d70eb408/5$ grep -A 2 sigaltstack /result/kernel_selftests/defaults/lkp-hsw-ep4/debian-x86_64-2016-08-31.cgz/x86_64-rhel-7.2/gcc-6/c0bc126f97fb929b3ae02c1c62322645d70eb408/5/kernel_selftests.json "kernel_selftests.sigaltstack./usr/src/linux-selftests-x86_64-rhel-7.2-c0bc126f97fb929b3ae02c1c62322645d70eb408/tools/testing/selftests/sigaltstack/sas.pass": [ 1 ], "kernel_selftests.sigaltstack.sas.pass": [ 1 ], ------------ Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- stats/kernel_selftests | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/stats/kernel_selftests b/stats/kernel_selftests index 85954927c..a9474bc01 100755 --- a/stats/kernel_selftests +++ b/stats/kernel_selftests @@ -63,21 +63,6 @@ def x86_stat(line, _x86, stats) end end -def sigaltstack_stat(line, sigaltstack, stats) - case line - when /gcc -Wall .+ -o (.+)/ - sigaltstack['subtest'] = $1 - when /^(\[FAIL\]|mmap)/ - stats << "sigaltstack.#{sigaltstack['subtest']}.fail: 1" - sigaltstack['subtest'] = nil - when /Test passed/ - stats << "sigaltstack.#{sigaltstack['subtest']}.pass: 1" - sigaltstack['subtest'] = nil - when %r{make: Leaving directory .*/(.*)'} - stats << "sigaltstack.#{sigaltstack['subtest']}.skip: 1" if sigaltstack['subtest'] - end -end - while (line = STDIN.gets) line = line.remediate_invalid_byte_sequence(replace: '_') unless line.valid_encoding? @@ -89,8 +74,6 @@ while (line = STDIN.gets) memory_hotplug_stat(line, tests_stats['memory-hotplug'], stats) elsif testname == 'mount' mount_stat(line, tests_stats['mount'], stats) - elsif testname == 'sigaltstack' - sigaltstack_stat(line, tests_stats['sigaltstack'], stats) else # rli9 FIXME: consider the input has messed text like Entering doesn't match with Leaving testname = nil @@ -124,8 +107,6 @@ while (line = STDIN.gets) mount_stat(line, tests_stats['mount'], stats) elsif testname == 'x86' x86_stat(line, tests_stats['x86'], stats) - elsif testname == 'sigaltstack' - sigaltstack_stat(line, tests_stats['sigaltstack'], stats) end end end