aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-10-04 09:30:33 +0000
committerNIIBE Yutaka <[email protected]>2023-10-04 09:30:33 +0000
commit98dd6f7af6aa3dcce19f20c22e3f825676e6b184 (patch)
tree6cb4e5b5d11c1967cd3a1f2938639a958bead3b1 /configure.ac
parentagent: Fix agent_update_private_key. (diff)
downloadgnupg-98dd6f7af6aa3dcce19f20c22e3f825676e6b184.tar.gz
gnupg-98dd6f7af6aa3dcce19f20c22e3f825676e6b184.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. -- GnuPG-bug-id: 6052 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 118e588f7..8f09bb06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1627,7 +1627,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)
#