From bfba7974160d22dee54cc797ae1d3ea508984449 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 11 Mar 2012 20:20:43 +0100 Subject: [PATCH] Better fix. --- dashboard.pl | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dashboard.pl b/dashboard.pl index 5270d3b..ff18e87 100755 --- a/dashboard.pl +++ b/dashboard.pl @@ -73,8 +73,8 @@ foreach my $s (keys %list) { $result=`grep -- '-TEST FAILED-' $item->{dir}/report.twiki 2>/dev/null| wc -l | sed 's/ *//g'`; chomp $result; } else { - if ($section == 0) { $result = 'Error'; } - else { $result = 'Failed'; } + if ($section == 0) { $result = 'Error'; } + else { $result = 'Failed'; } } } else { undef $result; } $item->{result} = defined $result ? $result : '-'; @@ -209,8 +209,9 @@ print qq( if ($item->{result} eq '0') { $class='OK'; } else { $class='FAIL'; } - if ( $item->{result} == "0" ) { $result="$item->{result} error"; } - else { $result="$item->{result} errors"; } + if ( $item->{result} eq '1' ) { $result="$item->{result} error"; } + elsif ($item->{result} =~ /^[0-9]+$/) { $result="$item->{result} errors"; } + else { $result = "$item->{result}"; } print " $item->{date}
{dir}/\">$result\n"; } else { @@ -219,9 +220,13 @@ print qq( $item = $list{upgrade}{$c}{$p}; if (defined $item) { - $result = $item->{result}; if ($item->{result} eq '0') { $class='OK'; } else { $class='FAIL'; } + + if ( $item->{result} eq '1' ) { $result="$item->{result} error"; } + elsif ($item->{result} =~ /^[0-9]+$/) { $result="$item->{result} errors"; } + else { $result = "$item->{result}"; } + print " $item->{date}
{dir}/\">$result\n"; } else { print " \n" -- 1.8.2.3