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:
	98dd6f7af6

GnuPG-bug-id: 6052
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

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)
 
 #

tests/tpm2dtests/start_sw_tpm.sh

@@ -3,12 +3,15 @@
 # remove any prior TPM contents
 rm -f NVChip h*.bin *.permall
 if [ -x "${SWTPM}" ]; then
-    ${SWTPM} socket --tpm2 --server type=tcp,port=2321 \
-         --ctrl type=tcp,port=2322 --tpmstate dir=`pwd` &
+    ${SWTPM} socket --tpm2 --daemon      \
+	     --pid file=swtpm.pid        \
+	     --server type=tcp,port=2321 \
+             --ctrl type=tcp,port=2322 --tpmstate dir=`pwd`
+    pid=$(cat swtpm.pid)
 else
     ${TPMSERVER} > /dev/null 2>&1  &
+    pid=$!
 fi
-pid=$!
 ##
 # This powers on the tpm and starts it
 # then we derive the RSA version of the storage seed and