diff options
Diffstat (limited to 'tools/testing/ktest/ktest.pl')
-rwxr-xr-x | tools/testing/ktest/ktest.pl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 5b35fa04429b..5924f14ba418 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl | |||
@@ -104,6 +104,7 @@ my $monitor_cnt = 0; | |||
104 | my $sleep_time; | 104 | my $sleep_time; |
105 | my $bisect_sleep_time; | 105 | my $bisect_sleep_time; |
106 | my $patchcheck_sleep_time; | 106 | my $patchcheck_sleep_time; |
107 | my $ignore_warnings; | ||
107 | my $store_failures; | 108 | my $store_failures; |
108 | my $test_name; | 109 | my $test_name; |
109 | my $timeout; | 110 | my $timeout; |
@@ -2074,6 +2075,13 @@ sub patchcheck { | |||
2074 | @list = reverse @list; | 2075 | @list = reverse @list; |
2075 | 2076 | ||
2076 | my $save_clean = $noclean; | 2077 | my $save_clean = $noclean; |
2078 | my %ignored_warnings; | ||
2079 | |||
2080 | if (defined($ignore_warnings)) { | ||
2081 | foreach my $sha1 (split /\s+/, $ignore_warnings) { | ||
2082 | $ignored_warnings{$sha1} = 1; | ||
2083 | } | ||
2084 | } | ||
2077 | 2085 | ||
2078 | $in_patchcheck = 1; | 2086 | $in_patchcheck = 1; |
2079 | foreach my $item (@list) { | 2087 | foreach my $item (@list) { |
@@ -2100,7 +2108,10 @@ sub patchcheck { | |||
2100 | build "oldconfig" or return 0; | 2108 | build "oldconfig" or return 0; |
2101 | } | 2109 | } |
2102 | 2110 | ||
2103 | check_buildlog $sha1 or return 0; | 2111 | |
2112 | if (!defined($ignored_warnings{$sha1})) { | ||
2113 | check_buildlog $sha1 or return 0; | ||
2114 | } | ||
2104 | 2115 | ||
2105 | next if ($type eq "build"); | 2116 | next if ($type eq "build"); |
2106 | 2117 | ||
@@ -2288,6 +2299,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) { | |||
2288 | $sleep_time = set_test_option("SLEEP_TIME", $i); | 2299 | $sleep_time = set_test_option("SLEEP_TIME", $i); |
2289 | $bisect_sleep_time = set_test_option("BISECT_SLEEP_TIME", $i); | 2300 | $bisect_sleep_time = set_test_option("BISECT_SLEEP_TIME", $i); |
2290 | $patchcheck_sleep_time = set_test_option("PATCHCHECK_SLEEP_TIME", $i); | 2301 | $patchcheck_sleep_time = set_test_option("PATCHCHECK_SLEEP_TIME", $i); |
2302 | $ignore_warnings = set_test_option("IGNORE_WARNINGS", $i); | ||
2291 | $bisect_manual = set_test_option("BISECT_MANUAL", $i); | 2303 | $bisect_manual = set_test_option("BISECT_MANUAL", $i); |
2292 | $bisect_skip = set_test_option("BISECT_SKIP", $i); | 2304 | $bisect_skip = set_test_option("BISECT_SKIP", $i); |
2293 | $config_bisect_good = set_test_option("CONFIG_BISECT_GOOD", $i); | 2305 | $config_bisect_good = set_test_option("CONFIG_BISECT_GOOD", $i); |