Changeset 33af2b7 in mod_gnutls for test/test-24_pkcs11_cert.bash

Timestamp:

May 11, 2015, 6:28:20 PM (6 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

31caead

Parents:

e24eed68

git-author:

Thomas Klute <thomas2.klute@…> (05/11/15 18:12:28)

git-committer:

Thomas Klute <thomas2.klute@…> (05/11/15 18:28:20)

Message:

Test suite: Add tests to "dist" target and support VPATH builds

Supporting VPATH builds requires using $srcdir to find non-generated
data rather than fixed relative paths. If test are not called through
the make system, local defaults must be used. Not changing directories
during tests any more makes this easier.

A few files (e.g. templates, generated CRL) have been moved around to
better match the new structure.

File:

• test/test-24_pkcs11_cert.bash (modified) (1 diff)

test/test-24_pkcs11_cert.bash

@@ -1 +1 @@
 #!/bin/bash
 
-testdir="./tests/24_pkcs11_cert"
-. ./softhsm.bash
+testdir="$(dirname ${0})/tests/24_pkcs11_cert"
+
+# The Apache/SoftHSM configuration mixes up directories, so generate a
+# config file with an absolute path to the token database from a
+# template. Generating it on every run avoids problems if the source
+# tree was moved.
+tmp_softhsm_conf="$(mktemp mod_gnutls_test-XXXXXX.conf)"
+function cleanup_tmpconf
+{
+    rm "${tmp_softhsm_conf}"
+}
+trap cleanup_tmpconf EXIT
+
+sed "s,__DIR__,$(realpath $(pwd))," \
+    "${testdir}/softhsm.conf.in" \
+    >"${tmp_softhsm_conf}"
+export SOFTHSM_CONF="${tmp_softhsm_conf}"
+echo "Generated temporary SoftHSM config ${tmp_softhsm_conf}:"
+cat "${tmp_softhsm_conf}"
+
+. $(dirname ${0})/softhsm.bash
 
 set -e
 
-make -f TestMakefile t-24
+make -f $(dirname ${0})/TestMakefile t-24
+
+cleanup_tmpconf
+trap - EXIT