Use separate softhsm databases and config in tests to allow parallel runs.

diff --git a/.gitignore b/.gitignore
index 9587fdcc73f3c573bd9d034f16e5f443c0b6040a..05e92c2e9ee0945732eaf68e210267556a57641e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -702,5 +702,6 @@ tests/x509-extensions
 tests/sec-params
 tests/suite/pkcs11-chainverify
 tests/suite/softhsm.config
-tests/suite/softhsm.db
-tests/suite/softhsm.db-journal
+tests/suite/softhsm*.db
+tests/suite/softhsm*.db-journal
+tests/suite/softhsm*.config

diff --git a/tests/suite/testpkcs11 b/tests/suite/testpkcs11
index 6f3ffd23d7845c88b8731c08d4931de26bea41d3..a315d5f6fce1303305c365c927556b13b445db6b 100755 (executable)
--- a/tests/suite/testpkcs11
+++ b/tests/suite/testpkcs11
@@ -56,12 +56,13 @@ if test "$1" = "pkcs15";then
     exit 1
   fi
 else
-  export SOFTHSM_CONF="softhsm.config"
+  export SOFTHSM_CONF="softhsm-testpkcs11.config"
   if test -f /usr/lib/softhsm/libsofthsm.so;then
     ADDITIONAL_PARAM="--provider /usr/lib/softhsm/libsofthsm.so"
   else
     ADDITIONAL_PARAM="--provider /usr/lib/softhsm/libsofthsm.so"
   fi
+  echo "0:./softhsm-testpkcs11.db" > $SOFTHSM_CONF
 
   echo -n "* Initializing smart card... "
   softhsm --init-token --slot 0 --label "GnuTLS-Test" --so-pin 1234 --pin 1234 >/dev/null 2>&1
@@ -190,6 +191,6 @@ wait
 echo ok
 
 echo "* All smart cards tests succeeded"
-rm -f tmp-client.crt tmp-client.pub
+rm -f tmp-client.crt tmp-client.pub $SOFTHSM_CONF
 
 exit 0