diff options
| author | Damien Goutte-Gattat via Gnupg-devel <[email protected]> | 2021-03-15 21:20:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-03-16 09:57:01 +0000 |
| commit | c0f50811fcf81e5ebe2df326342081cfdacfbbfc (patch) | |
| tree | 48dacf2166325617d026e0e30314603b4a1657f3 | |
| parent | build: Fix distcheck when tpm2dtests are run. (diff) | |
| download | gnupg-c0f50811fcf81e5ebe2df326342081cfdacfbbfc.tar.gz gnupg-c0f50811fcf81e5ebe2df326342081cfdacfbbfc.zip | |
build: Check for the IBM TSS tools to run the tpm2d tests.
* configure.ac (TEST_LIBTSS): Make that conditional depend on the
detection of tssstartup.
--
While the tpm2d daemon can use either the Intel TSS or the IBM TSS,
the test code (specifically, the start_sw_tpm.sh script) requires
some tools from the IBM TSS (tssstartup and tsspowerup).
If a software TPM is detected at configure time but the IBM TSS
tools are absent (e.g. because only the Intel TSS is available on
the system), `make check` will attempt to run the tpm2d tests and
those will fail when the start_sw_tpm.sh script is launched.
This patch makes running the tpm2d tests dependent not only on
the detection of a software TPM, but also on the detection of
tssstartup (it is probably safe to assume that if tssstartup is
present, then tsspowerup is available as well).
Signed-off-by: Damien Goutte-Gattat <[email protected]>
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 82e3e670c..59374491f 100644 --- a/configure.ac +++ b/configure.ac @@ -1638,6 +1638,7 @@ if test "$build_tpm2d" = "yes"; then AC_PATH_PROG(TPMSERVER, tpm_server,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) AC_PATH_PROG(SWTPM, swtpm,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) AC_PATH_PROG(SWTPM_IOCTL, swtpm_ioctl,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) + AC_PATH_PROG(TSSSTARTUP, tssstartup,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) fi fi if test "$have_libtss" = no; then @@ -1646,7 +1647,7 @@ fi AC_SUBST(LIBTSS_LIBS) AC_SUBST(LIBTSS_CFLAGS) AM_CONDITIONAL(HAVE_LIBTSS, test "$have_libtss" != no) -AM_CONDITIONAL(TEST_LIBTSS, test -n "$TPMSERVER" -o -n "$SWTPM") +AM_CONDITIONAL(TEST_LIBTSS, test -n "$TPMSERVER" || test -n "$SWTPM" && test -n "$TSSSTARTUP") AC_SUBST(HAVE_LIBTSS) # |