[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  7e8d6bafd0347de8653c336e6f067d8f3686a386 (commit)
       via  86825c99172f46da40867292a0eeebb2ef289c02 (commit)
       via  e47ed5fe1faff9b5f9c3112bfcbf7c5165eabf33 (commit)
      from  31b7f23d2f958491d46c8a8e61c2b77b1b546f3e (commit)


- Log -----------------------------------------------------------------
commit 7e8d6bafd0347de8653c336e6f067d8f3686a386
Author: Tomas Mraz <tomas at openssl.org>
Date:   Mon May 31 17:00:38 2021 +0200

    Make the 00-prep_*.t recipe truly mandatory
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15550)

commit 86825c99172f46da40867292a0eeebb2ef289c02
Author: Tomas Mraz <tomas at openssl.org>
Date:   Mon May 31 14:22:35 2021 +0200

    Windows CI: enable fips on shared 64 bit build
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15550)

commit e47ed5fe1faff9b5f9c3112bfcbf7c5165eabf33
Author: Tomas Mraz <tomas at openssl.org>
Date:   Mon May 31 14:18:56 2021 +0200

    Fix enable-fips builds on Windows
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15550)

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/windows.yml        | 10 +++++-----
 Configurations/windows-makefile.tmpl |  2 +-
 test/run_tests.pl                    | 22 ++++++++++++++--------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0d0b594808..0de6e22893 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -24,15 +24,15 @@ jobs:
     - name: config
       working-directory: _build
       run: |
-        if ( "${{ matrix.arch }}" -eq "win32" ) { $target = "VC-WIN32" } else { $target = "VC-WIN64A" }
-        perl ..\Configure --banner=Configured no-makedepend no-fips $target
+        if ( "${{ matrix.arch }}" -eq "win32" ) { $target = "VC-WIN32" ; $fips = "no-fips" } else { $target = "VC-WIN64A" ; $fips = "enable-fips" }
+        perl ..\Configure --banner=Configured no-makedepend $fips $target
         perl configdata.pm --dump
     - name: build
       working-directory: _build
       run: nmake
     - name: test
       working-directory: _build
-      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
     - name: install
       # Run on 64 bit only as 32 bit is slow enough already
       if: $${{ matrix.arch == 'win64' }}
@@ -57,7 +57,7 @@ jobs:
       run: nmake
     - name: test
       working-directory: _build
-      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
   minimal:
     runs-on: windows-latest
     steps:
@@ -75,4 +75,4 @@ jobs:
       run: nmake
     - name: test
       working-directory: _build
-      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index af8a81c8b2..d6ba2d13fd 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -65,7 +65,7 @@ FIPSMODULE={- # We do some extra checking here, as there should be only one
                          && $unified_info{attributes}->{modules}->{$_}->{fips} }
                   @{$unified_info{modules}};
               die "More that one FIPS module" if scalar @fipsmodules > 1;
-              join(" ", map { basename(platform->dso($_)) } @fipsmodules) -}
+              join(" ", map { platform->dso($_) } @fipsmodules) -}
 FIPSMODULENAME={- die "More that one FIPS module" if scalar @fipsmodules > 1;
                   join(", ", map { basename(platform->dso($_)) } @fipsmodules) -}
 PROGRAMS={- our @PROGRAMS = map { platform->bin($_) } @{$unified_info{programs}}; join(" ", @PROGRAMS) -}
diff --git a/test/run_tests.pl b/test/run_tests.pl
index 9f34ab9e7e..ea054bc189 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -83,7 +83,7 @@ sub reorder {
 
     # for parallel test runs, do slow tests first
     if ($jobs > 1 && $key =~ m/test_ssl_new|test_fuzz/) {
-        $key =~ s/(\d+)-/00-/;
+        $key =~ s/(\d+)-/01-/;
     }
     return $key;
 }
@@ -131,18 +131,20 @@ foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
     $initial_arg = 0;
 }
 
+# prep recipes are mandatory and need to be always run first
+my @preps = glob(catfile($recipesdir,"00-prep_*.t"));
+foreach my $test (@preps) {
+    delete $tests{$test};
+}
+
 sub find_matching_tests {
     my ($glob) = @_;
 
-    # prep recipes are mandatory
-    my @recipes = glob(catfile($recipesdir,"00-prep_*.t"));
-
     if ($glob =~ m|^[\d\[\]\?\-]+$|) {
-        push @recipes, glob(catfile($recipesdir,"$glob-*.t"));
-    } else {
-        push @recipes, glob(catfile($recipesdir,"*-$glob.t"));
+        return glob(catfile($recipesdir,"$glob-*.t"));
     }
-    return @recipes;
+
+    return glob(catfile($recipesdir,"*-$glob.t"));
 }
 
 # The following is quite a bit of hackery to adapt to both TAP::Harness
@@ -305,6 +307,10 @@ unless (defined $eres) {
 
 my $harness = $package->new(\%tapargs);
 my $ret =
+    $harness->runtests(map { [ abs2rel($_, rel2abs(curdir())), basename($_) ] }
+                       @preps);
+die if $ret->has_errors;
+$ret =
     $harness->runtests(map { [ abs2rel($_, rel2abs(curdir())), basename($_) ] }
                        sort { reorder($a) cmp reorder($b) } keys %tests);