| Message ID | 20210907235746.112665-1-songkai01@inspur.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Fix the statistical number of results in the html | expand |
Hi, > From: wangkaiyuan <wangkaiyuan@inspur.com> > According to the statistical method of ltp-pan on TFAIL TBROK TCONF > TPASS..., the statistical method of the ltp test result type in > genhtml.pl is modified to ensure that the .log format of the ltp > result is consistent with the test result in the .html format. > The original statistical method policy expression "/\ TFAIL\ /" in > the original genhtml.pl for the test result type cannot match the > "TFAIL:" in the normal test result, causing problems in the This could be fixed with :?, right? > calculation result. At the same time, the statistical method in > genhtml.pl cannot guarantee that each test item has only one test > result, because the output of a test item may include TFAIL, TCONF, > and TPASS at the same time. That's a valid input. > Signed-off-by: wangkaiyuan <wangkaiyuan@inspur.com> > Chunsing.dey <daichx@inspur.com> nit: both should have Signed-off-by:, you can also use Co-developed-by: for the second developer. nit: there are whitespace errors in the patch. I do not dare to review it as I've never used the tool. FYI ltp-pan is deprecated, you can try to use runltp-ng [1] which we'd like to bring to LTP upstream (to replace ltp-pan and runltp). Kind regards, Petr [1] https://github.com/metan-ucw/runltp-ng
Hi! First of all, sorry for the delay in response. Secondly the genhtml.pl is basically unmaintained and we hope to replace runltp and the tooling around that with runltp-ng ideally within a year, at least I hope to do so. The patch itself looks reasonable, minus some whitespaces that break the indentation. So unless somebody is against it, we can as well apply it, that is after you fix the whitespaces. I think that in reality nobody really cares about the script anymore so noone will block the change. > According to the statistical method of ltp-pan on TFAIL TBROK TCONF > TPASS..., the statistical method of the ltp test result type in > genhtml.pl is modified to ensure that the .log format of the ltp > result is consistent with the test result in the .html format. > > The original statistical method policy expression "/\ TFAIL\ /" in > the original genhtml.pl for the test result type cannot match the > "TFAIL:" in the normal test result, causing problems in the > calculation result. At the same time, the statistical method in > genhtml.pl cannot guarantee that each test item has only one test > result, because the output of a test item may include TFAIL, TCONF, > and TPASS at the same time. > > Signed-off-by: wangkaiyuan <wangkaiyuan@inspur.com> > Chunsing.dey <daichx@inspur.com> Each line here has to start with the 'Signed-off-by: '
Hi! Please send plain text emails only to the mailing list.
diff --git a/tools/genhtml.pl b/tools/genhtml.pl old mode 100644 new mode 100755 index 7e9bdd471..1f440b4fa --- a/tools/genhtml.pl +++ b/tools/genhtml.pl @@ -50,6 +50,7 @@ my $retr_test_counter = 0; my $retr_test_counter_flag = 0; my $conf_test_counter = 0; my $conf_test_counter_flag = 0; +my $test_passed = 0; my $detected_fail = 0; my $detected_pass = 0; @@ -115,7 +116,7 @@ foreach my $file (@ARGV) { if ($line =~ /$end_tag/) { print "$row_line"; $process_line = 0; - $flag = 0; $flag2 = 0; $flag3 = 0; $flag4 = 0; + $flag = 0; $flag2 = 0; $flag3 = 0; $flag4 = 0; $flag5 = 0; $detected_fail = 0; $detected_pass = 0; $detected_warn = 0; $detected_brok = 0; $detected_retr = 0; $detected_conf = 0; $background_colour = 0; $failed_test_counter_flag = 0; $brok_test_counter_flag = 0; $warn_test_counter_flag = 0; $retr_test_counter_flag = 0; $conf_test_counter_flag = 0; $row_line= ""; } @@ -175,39 +176,31 @@ foreach my $file (@ARGV) { $flag2 = 0; $flag3 = 1; $flag4 = 1; + $flag5 = 1; $row_line = $row_line . "</strong></pre></td>"; } - if ( $flag2 == 1 ) { + if ( $flag2 == 1 ) { $row_line = $row_line . "$line \n"; - if ($line =~ /\ TFAIL\ / ) { - $detected_fail = 1; - if ( $failed_test_counter_flag == 0 ) { - $failed_test_counter++; - $failed_test_counter_flag=1; - } - } elsif ($line =~ /\ TBROK\ / ) { - $detected_brok = 1; - if ( $brok_test_counter_flag == 0 ) { - $brok_test_counter++; - $brok_test_counter_flag=1; - } - } elsif ($line =~ /\ TWARN\ / ) { - $detected_warn = 1; - if ( $warn_test_counter_flag == 0 ) { - $warn_test_counter++; - $warn_test_counter_flag=1; - } - } elsif ($line =~ /\ TCONF\ / ) { - $detected_conf = 1; - if ( $conf_test_counter_flag == 0 ) { - $conf_test_counter++; - $conf_test_counter_flag=1; - } - } else { + } + if ( $flag5 == 1 ) { + if ($line =~ "termination_id=1" ) { + $detected_fail = 1; + $failed_test_counter++; + } elsif ($line =~ "termination_id=2" ) { + $detected_brok = 1; + $brok_test_counter++; + } elsif ($line =~ "termination_id=4" ) { + $detected_warn = 1; + $warn_test_counter++; + } elsif ($line =~ "termination_id=32" ) { + $detected_conf = 1; + $conf_test_counter++; + } elsif ($line =~ "termination_id=0" ) { $detected_pass = 1; - } + $test_passed++; + } } - if ( $line =~ /$output_tag/ ) { + if ( $line =~ /$output_tag/ ) { $flag2 = 1; $row_line = $row_line . "<td><pre><strong>"; } @@ -233,7 +226,6 @@ print "<tr><td><strong>Output/Failed Result</strong></td><td><a href=\"file://$E print "<tr><td><strong>Total Tests</strong></td><td><strong>"; $test_counter--; print "$test_counter </strong></td></tr>\n"; -$test_passed=$test_counter-$failed_test_counter-$brok_test_counter-$warn_test_counter-$retr_test_counter-$conf_test_counter; print "<tr><td><strong>Total Test TPASS:</strong></td><td><strong> $test_passed </strong></td></tr>\n"; print "<tr><td><strong>Total Test TFAIL:</strong></td><td><strong> $failed_test_counter </strong></td></tr>\n"; print "<tr><td><strong>Total Test TBROK</strong></td><td><strong> $brok_test_counter </strong></td></tr>\n";