diff options
| author | NIIBE Yutaka <[email protected]> | 2023-10-04 09:30:33 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-10-06 00:55:36 +0000 |
| commit | 0e200f2187e005d8c52d8efb5ef89e4709eabcc1 (patch) | |
| tree | 6eb2f07556f3a6b0815501ff0d18a3151d37cfeb /configure.ac | |
| parent | build: Simplify detecting a TPM emulator. (diff) | |
| download | gnupg-0e200f2187e005d8c52d8efb5ef89e4709eabcc1.tar.gz gnupg-0e200f2187e005d8c52d8efb5ef89e4709eabcc1.zip | |
tests:tpm2dtests: Fix tests with SWTPM.
* configure.ac (TEST_LIBTSS): Fix the condition with SWTPM.
* tests/tpm2dtests/start_sw_tpm.sh: Use --daemon and --pid
to run SWTPM.
--
Cherry-picked from master commit of:
98dd6f7af6aa3dcce19f20c22e3f825676e6b184
GnuPG-bug-id: 6052
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6536810f1..72c99b1be 100644 --- a/configure.ac +++ b/configure.ac @@ -1625,7 +1625,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" || test -n "$SWTPM" && test -n "$TSSSTARTUP") +AM_CONDITIONAL(TEST_LIBTSS, test -n "$TPMSERVER" -o -n "$SWTPM" -a -n "$TSSSTARTUP" -a -n "$SWTPM_IOCTL") AC_SUBST(HAVE_LIBTSS) # |