diff options
| author | Pauli <pauli@openssl.org> | 2021-04-28 11:25:52 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-04-29 17:40:24 +1000 |
| commit | 2395ad8079bdc76790a004f9aaeb53ef0b1c8df8 (patch) | |
| tree | b584b46cccfd489a02408c8158655dc16cef2d5b /providers/build.info | |
| parent | 3babc1e468c9a5cfb30582a3ea1d55c1ec776361 (diff) | |
test: never run fipsinstall if the tests are not enabled.
Fixes #15056
The dependency for fipsinstall was being added to the makefile regardless of
it being used. This means that a subsequent `make test` would fail if the
command line application wasn't present. Rather than fix the instance in question,
it is better to leave out this part of the makefile if the tests cannot be
run.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15057)
Diffstat (limited to 'providers/build.info')
| -rw-r--r-- | providers/build.info | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/providers/build.info b/providers/build.info index 4296aa05a6..b772e5ec25 100644 --- a/providers/build.info +++ b/providers/build.info @@ -147,11 +147,13 @@ IF[{- !$disabled{fips} -}] # module installation. We have the output go to standard output, because # the generated commands in build templates are expected to catch that, # and thereby keep control over the exact output file location. - DEPEND[|tests|]=fipsmodule.cnf - GENERATE[fipsmodule.cnf]=../apps/openssl fipsinstall \ - -module providers/$(FIPSMODULENAME) -provider_name fips \ - -mac_name HMAC -section_name fips_sect - DEPEND[fipsmodule.cnf]=$FIPSGOAL + IF[{- !$disabled{tests} -}] + DEPEND[|tests|]=fipsmodule.cnf + GENERATE[fipsmodule.cnf]=../apps/openssl fipsinstall \ + -module providers/$(FIPSMODULENAME) -provider_name fips \ + -mac_name HMAC -section_name fips_sect + DEPEND[fipsmodule.cnf]=$FIPSGOAL + ENDIF ENDIF # |