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

Commits:

1 changed file:

Changes:

  • TBBTestSuite/TestSuite/TorBrowserBuild.pm
    ... ... @@ -46,6 +46,7 @@ sub set_tests {
    46 46
                 descr => 'create incrementals for tor-browser nightly linux-x86_64',
    
    47 47
                 type  => 'make_incrementals',
    
    48 48
                 publish_dir => 'nightly-linux-x86_64',
    
    49
    +            projectname => 'torbrowser',
    
    49 50
             },
    
    50 51
             {
    
    51 52
                 name  => 'torbrowser-nightly-linux-i686',
    
    ... ... @@ -65,6 +66,7 @@ sub set_tests {
    65 66
                 descr => 'create incrementals for tor-browser nightly linux-i686',
    
    66 67
                 type  => 'make_incrementals',
    
    67 68
                 publish_dir => 'nightly-linux-i686',
    
    69
    +            projectname => 'torbrowser',
    
    68 70
             },
    
    69 71
             {
    
    70 72
                 name  => 'torbrowser-nightly-windows-i686',
    
    ... ... @@ -84,6 +86,7 @@ sub set_tests {
    84 86
                 descr => 'create incrementals for tor-browser nightly windows-i686',
    
    85 87
                 type  => 'make_incrementals',
    
    86 88
                 publish_dir => 'nightly-windows-i686',
    
    89
    +            projectname => 'torbrowser',
    
    87 90
             },
    
    88 91
             {
    
    89 92
                 name  => 'torbrowser-nightly-windows-x86_64',
    
    ... ... @@ -103,6 +106,7 @@ sub set_tests {
    103 106
                 descr => 'create incrementals for tor-browser nightly windows-x86_64',
    
    104 107
                 type  => 'make_incrementals',
    
    105 108
                 publish_dir => 'nightly-windows-x86_64',
    
    109
    +            projectname => 'torbrowser',
    
    106 110
             },
    
    107 111
             {
    
    108 112
                 name  => 'torbrowser-nightly-macos',
    
    ... ... @@ -122,6 +126,7 @@ sub set_tests {
    122 126
                 descr => 'create incrementals for tor-browser nightly macos (universal)',
    
    123 127
                 type  => 'make_incrementals',
    
    124 128
                 publish_dir => 'nightly-macos',
    
    129
    +            projectname => 'torbrowser',
    
    125 130
             },
    
    126 131
             {
    
    127 132
                 name  => 'torbrowser-nightly-android-armv7',
    
    ... ... @@ -247,17 +252,21 @@ sub set_tests {
    247 252
     sub make_incrementals {
    
    248 253
         my ($testsuite, $test) = @_;
    
    249 254
         $test->{results}{success} = 0;
    
    250
    -    mkdir 'nightly' unless -d 'nightly';
    
    255
    +    my $projectname = $test->{projectname};
    
    256
    +    my $nightlydir = "$projectname/nightly";
    
    257
    +    for my $dir ($projectname, $nightlydir) {
    
    258
    +      mkdir $dir unless -d $dir;
    
    259
    +    }
    
    251 260
         # Clean the nightly directory
    
    252
    -    foreach my $subdir (path('nightly')->children) {
    
    261
    +    foreach my $subdir (path($nightlydir)->children) {
    
    253 262
             unlink $subdir if -l $subdir;
    
    254 263
         }
    
    255 264
         foreach my $builddir (path($testsuite->{publish_dir} . '/..')->children) {
    
    256 265
             if (-f "$builddir/$test->{publish_dir}/sha256sums-unsigned-build.txt") {
    
    257
    -            symlink("$builddir/$test->{publish_dir}", 'nightly/' . $builddir->basename);
    
    266
    +            symlink("$builddir/$test->{publish_dir}", "$nightlydir/$builddir->basename");
    
    258 267
             }
    
    259 268
         }
    
    260
    -    my @cmd = ('make', 'incrementals-nightly');
    
    269
    +    my @cmd = ('make', $test->{projectname} . '-incrementals-nightly');
    
    261 270
         run_to_file("$testsuite->{'results-dir'}/$test->{name}.build.txt", @cmd)
    
    262 271
             or return;
    
    263 272
         $test->{results}{success} = 1;