[tor-commits] [Git][tpo/applications/tor-browser-bundle-testsuite][main] Bug 40072: Fix torbrowser-incrementals-nightly-*

[boklm (@boklm)]

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


Commits:
695bb8ef by Nicolas Vigier at 2023-02-01T11:18:27+01:00
Bug 40072: Fix torbrowser-incrementals-nightly-*

With tor-browser-build#40737 the nightly/ directory is now prefixed
with the $projectname, and with tor-browser-build#40742 the makefile
rule to generate the incrementals is now $projectname-incrementals-nightly.

- - - - -


1 changed file:

- TBBTestSuite/TestSuite/TorBrowserBuild.pm


Changes:

=====================================
TBBTestSuite/TestSuite/TorBrowserBuild.pm
=====================================
@@ -46,6 +46,7 @@ sub set_tests {
             descr => 'create incrementals for tor-browser nightly linux-x86_64',
             type  => 'make_incrementals',
             publish_dir => 'nightly-linux-x86_64',
+            projectname => 'torbrowser',
         },
         {
             name  => 'torbrowser-nightly-linux-i686',
@@ -65,6 +66,7 @@ sub set_tests {
             descr => 'create incrementals for tor-browser nightly linux-i686',
             type  => 'make_incrementals',
             publish_dir => 'nightly-linux-i686',
+            projectname => 'torbrowser',
         },
         {
             name  => 'torbrowser-nightly-windows-i686',
@@ -84,6 +86,7 @@ sub set_tests {
             descr => 'create incrementals for tor-browser nightly windows-i686',
             type  => 'make_incrementals',
             publish_dir => 'nightly-windows-i686',
+            projectname => 'torbrowser',
         },
         {
             name  => 'torbrowser-nightly-windows-x86_64',
@@ -103,6 +106,7 @@ sub set_tests {
             descr => 'create incrementals for tor-browser nightly windows-x86_64',
             type  => 'make_incrementals',
             publish_dir => 'nightly-windows-x86_64',
+            projectname => 'torbrowser',
         },
         {
             name  => 'torbrowser-nightly-macos',
@@ -122,6 +126,7 @@ sub set_tests {
             descr => 'create incrementals for tor-browser nightly macos (universal)',
             type  => 'make_incrementals',
             publish_dir => 'nightly-macos',
+            projectname => 'torbrowser',
         },
         {
             name  => 'torbrowser-nightly-android-armv7',
@@ -247,17 +252,21 @@ sub set_tests {
 sub make_incrementals {
     my ($testsuite, $test) = @_;
     $test->{results}{success} = 0;
-    mkdir 'nightly' unless -d 'nightly';
+    my $projectname = $test->{projectname};
+    my $nightlydir = "$projectname/nightly";
+    for my $dir ($projectname, $nightlydir) {
+      mkdir $dir unless -d $dir;
+    }
     # Clean the nightly directory
-    foreach my $subdir (path('nightly')->children) {
+    foreach my $subdir (path($nightlydir)->children) {
         unlink $subdir if -l $subdir;
     }
     foreach my $builddir (path($testsuite->{publish_dir} . '/..')->children) {
         if (-f "$builddir/$test->{publish_dir}/sha256sums-unsigned-build.txt") {
-            symlink("$builddir/$test->{publish_dir}", 'nightly/' . $builddir->basename);
+            symlink("$builddir/$test->{publish_dir}", "$nightlydir/$builddir->basename");
         }
     }
-    my @cmd = ('make', 'incrementals-nightly');
+    my @cmd = ('make', $test->{projectname} . '-incrementals-nightly');
     run_to_file("$testsuite->{'results-dir'}/$test->{name}.build.txt", @cmd)
         or return;
     $test->{results}{success} = 1;



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite/-/commit/695bb8ef9595eb9fa9a8ed54335757de25ca51b9

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite/-/commit/695bb8ef9595eb9fa9a8ed54335757de25ca51b9
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230201/10bd1821/attachment-0001.htm>