Unverified Commit 241b82ef authored by boklm's avatar boklm
Browse files

Store reports in a 'r' sub-directory 

We may have other sub-directores later for other things than reports.
parent 823ffca2

TBBTestSuite/Reports.pm

+5 −4
Original line number Diff line number Diff line
@@ -14,15 +14,16 @@ use TBBTestSuite::Tests; 


sub set_report_dir {

    my ($report) = @_;

    my $rdir = $report->{options}{'reports-dir'} . '/r';

    if ($report->{options}{name}) {

        $report->{options}{'report-dir'} = "$report->{options}{'reports-dir'}/$report->{options}{name}";

        $report->{options}{'report-dir'} = "$rdir/$report->{options}{name}";

        make_path($options->{'report-dir'});

        return;

    }

    make_path($report->{options}{'reports-dir'});

    make_path($rdir);

    $report->{options}{'report-dir'} = File::Temp::newdir(

        'XXXXXX',

        DIR => $report->{options}{'reports-dir'},

        DIR => $rdir,

        CLEANUP => 0)->dirname;

    (undef, undef, $report->{options}{name})

                = File::Spec->splitpath($report->{options}{'report-dir'});
@@ -53,7 +54,7 @@ sub make_reports_index { 
        OUTPUT_PATH => $options->{'reports-dir'},

    );

    my %reports;

    foreach my $dir (glob "$options->{'reports-dir'}/*") {

    foreach my $dir (glob "$options->{'reports-dir'}/r/*") {

        my $resfile = "$dir/report.yml";

        next unless -f $resfile;

        my (undef, undef, $name) = File::Spec->splitpath($dir);

config/linus-nightly

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ my $today = DateTime->now->ymd; 
my $shaurl = "https://people.torproject.org/~linus/builds/tbb-nightly-$today/sha256sums.txt";

my $name = "tbb-nightly-$today-$osname";



if (-d "$options->{'reports-dir'}/$name") {

if (-d "$options->{'reports-dir'}/r/$name") {

    print "Doing nothing: $name already done\n";

    return ( args => [] );

}

tmpl/reports_index.html

+2 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
            </tr>

            [% FOREACH report IN reports_by_time %]

            <tr>

                <td valign="top"><a href="[% report %]/index.html">[% report %]</a></td>

                <td valign="top"><a href="r/[% report %]/index.html">[% report %]</a></td>

                <td valign="top">[% date.format(reports.$report.time, '%Y-%m-%d %H:%M') %]</td>

                <td valign="top">

                    [% failed = 0 %]

                    [% FOREACH tbbfile IN reports.$report.tbbfiles.keys %]

                      [% IF ! reports.$report.tbbfiles.$tbbfile.success %]

                        <span class="test_notok">Failed: <a href="[% report %]/[% tbbfile %].html">[% tbbfile %]</a></span><br />

                        <span class="test_notok">Failed: <a href="r/[% report %]/[% tbbfile %].html">[% tbbfile %]</a></span><br />

                        [% failed = 1 %]

                      [% END %]

                    [% END %]