GitLab

at 2025-09-30T16:29:01+02:00

Bug 40088: Add link to build files for failed builds

Bug 40087: Run make submodule-update/fetch/clean as a separate test

Instead of running those commands in pre_tests, run them as a separate
test, so that they can fail without preventing other tests from running.

     my $self = shift;

     my $res = $self->SUPER::test_types();

     $res->{make_incrementals} = \&make_incrementals;

+    $res->{make_fetch_clean} = \&make_fetch_clean;

     return $res;

 }

 sub set_tests {

     my ($testsuite) = @_;

     $testsuite->{tests} = [

+        {

+            name  => 'make_fetch_clean',

+            descr => 'run make submodule-update, make fetch, make clean',

+            type  => 'make_fetch_clean',

+        },

         # Tor Browser Nightly

         {

             name  => 'torbrowser-nightly-linux-x86_64',

     $test->{results}{success} = 1;

 }

+sub make_fetch_clean {

+    my ($testsuite, $test) = @_;

+    $test->{results}{success} = 0;

+    foreach my $cmd (('submodule-update', 'fetch', 'clean')) {

+        run_to_file("$testsuite->{'results-dir'}/$test->{name}.$cmd.txt", 'make', $cmd)

+            or return;

+    }

+    $test->{results}{success} = 1;

+}

+

 sub pre_tests {

     my ($tbbinfos) = @_;

     my $gr = TBBTestSuite::GitRepo->new({

     chdir $gr->clone_dir();

     copy($tbbinfos->{rbm_local_conf}, $gr->clone_dir() . '/rbm.local.conf')

             if $tbbinfos->{rbm_local_conf};

-    my @clean = ('clean') if $tbbinfos->{make_clean};

-    foreach my $cmd (('submodule-update', 'fetch', @clean)) {

-        my ($out, $err, $success) = capture_exec('make', $cmd);

-        if (!$success) {

-            $tbbinfos->{pre_tests_error} = "Error running make $cmd:\n$out\n$err";

-            return;

-        }

-    }

     if ($tbbinfos->{tbb_version}) {

         $ENV{TORBROWSER_NIGHTLY_VERSION} = $tbbinfos->{tbb_version};

     }

         publish_dir => "$builds_dir_root/tor-browser-builds/$tbb_version",

         publish_url => "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/$tbb_version",

         rbm_local_conf => "$FindBin::Bin/rbm-config/tb-build-06.torproject.org.rbm.local.conf",

-        make_clean => 1,

     });

 my %res = (

+<ul>

+[% FOREACH make_cmd = [ 'submodule-update', 'fetch', 'clean' ] %]

+    <li><a href="results-[% tbbfile %]/[% test.name %].[% make_cmd %].txt">make [% make_cmd %] logs</a></li>

+[% END %]

+</ul>
 <ul>

     <li><a href="results-[% tbbfile %]/[% test.name %].build.txt">build logs</a></li>

-[% IF test.results.success && tbbfiles.$tbbfile.publish_url %]

+[% IF tbbfiles.$tbbfile.publish_url %]

     <li><a href="[% tbbfiles.$tbbfile.publish_url %]/[% test.publish_dir %]">build files</a></li>

 [% END %]

 </ul>

boklm pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite

Commits:

4 changed files:

Changes: