Changeset 1150 for status/report.pl

Timestamp:

01/30/08 18:16:57 (10 months ago)

Author:

earle

Message:

Tabular output.

Files:

• status/report.pl (modified) (2 diffs)

status/report.pl

@@ -7 +7 @@
 use Template;
 
-my $file = $ARGV[0];
+my (%results, %test_names);
 
-die 'No input file specified'  unless $file;
-die "That file doesn't exist"  unless -e $file;
-die "That isn't a plain file"  unless -f _;
-die "That file isn't readable" unless -r _;
+foreach (glob "reports/*") {
+        my ($report_name) = $_ =~ m{reports/test-results-(.*)\.txt};
+        
+        $results{$report_name} = load_report($_);
+}
 
-open (my $RESULTS, '<', $file) or die "Can't open $file: $!";
-my @lines = <$RESULTS>;
-close $RESULTS;
-
-my (%tests, $current_test);
-
-foreach (@lines) {
-                chomp;
-
-                if (m{^t/(.*?)\.}) {
-                        $current_test = $1;
-                } elsif (/^ok$/) {
-                        $tests{$current_test} = 100;
-                } elsif (/Failed .*? tests, (.*?)% okay/) {
-                        $tests{$current_test} = $1;
-                }
-}
+my %report_data = (
+        'results'    => \%results,
+        'test_names' => [ sort keys %test_names ],
+);
 
 my $tt = Template->new({
@@ -36 +24 @@
 });
 
-$tt->process('tests.tt', { 'tests' => \%tests }) or die $tt->error;
+$tt->process('tests.tt', { 'data' => \%report_data }) or die $tt->error;
+
+# ----------------------------------------------------------------------------
+
+sub load_report {
+        my $file = shift;
+
+        die 'No input file specified'  unless $file;
+        die "That file doesn't exist"  unless -e $file;
+        die "That isn't a plain file"  unless -f _;
+        die "That file isn't readable" unless -r _;
+
+        open (my $RESULTS, '<', $file) or die "Can't open $file: $!";
+        my @lines = <$RESULTS>;
+        close $RESULTS;
+
+        my (%tests, $current_test);
+
+        # XXX: Test files get added, removed, renamed, etc. A mechanism is necessary
+        # here to cope with this.
+        
+        foreach (@lines) {
+                        chomp;
+
+                        if (m{^t/(.*?)\.}) {
+                                $current_test = $1;
+                                $test_names{$current_test} = 1;
+                        } elsif (/^ok$/) {
+                                $tests{$current_test} = 100;
+                        } elsif (/Failed .*? tests, (.*?)% okay/) {
+                                $tests{$current_test} = $1;
+                        }
+        }
+        
+        \%tests;
+}