diff options
| author | NIIBE Yutaka <[email protected]> | 2023-10-05 01:21:35 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-10-06 00:56:09 +0000 |
| commit | 9353dc811a04cf47f2445bb1e1f0401ea5f3d044 (patch) | |
| tree | 902e92dfcea4ee0b1a2af92a14e77e14b3c49f40 /configure.ac | |
| parent | tests:tpm2dtests: Fix tests with SWTPM. (diff) | |
| download | gnupg-9353dc811a04cf47f2445bb1e1f0401ea5f3d044.tar.gz gnupg-9353dc811a04cf47f2445bb1e1f0401ea5f3d044.zip | |
tests:tpm2dtests: Modify tests with SWTPM and relax the condition.
* configure.ac (SWTPM_IOCTL): Remove.
(TEST_LIBTSS): Fix the condition.
* tests/tpm2dtests/Makefile.am (TESTS_ENVIRONMENT): Remove
SWTPM_IOCTL.
* tests/tpm2dtests/start_sw_tpm.sh: Add --flags to invoke SWTPM,
not requiring SWTPM_IOCTL and TSSSTARTUP any more.
--
Cherry-picked from master commit of:
227b3b14f4be2f33ed721818c2186e7fca4cebdf
GnuPG-bug-id: 6052
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 72c99b1be..fc0590c14 100644 --- a/configure.ac +++ b/configure.ac @@ -1614,9 +1614,8 @@ if test "$build_tpm2d" = "yes"; then AC_DEFINE(HAVE_LIBTSS, 1, [Defined if we have TPM2 support library]) # look for a TPM emulator for testing AC_PATH_PROG(TPMSERVER, tpm_server) - AC_PATH_PROG(SWTPM, swtpm) - AC_PATH_PROG(SWTPM_IOCTL, swtpm_ioctl) AC_PATH_PROG(TSSSTARTUP, tssstartup) + AC_PATH_PROG(SWTPM, swtpm) fi fi if test "$have_libtss" = no; then @@ -1625,7 +1624,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" -a -n "$TSSSTARTUP" -a -n "$SWTPM_IOCTL") +AM_CONDITIONAL(TEST_LIBTSS, test -n "$SWTPM" -o -n "$TPMSERVER" -a -n "$TSSSTARTUP") AC_SUBST(HAVE_LIBTSS) # |