Changeset 33af2b7 in mod_gnutls for test/softhsm.bash

Timestamp:

May 11, 2015, 6:28:20 PM (7 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/softhsm.bash (modified) (2 diffs)

test/softhsm.bash

@@ -95 +95 @@
 softhsm_lib="${softhsm_prefix}/lib/softhsm/libsofthsm.so"
 
-# provided SOFTHSM_CONF always takes precedence, otherwise try to
-# guess based on testdir
+# fail if SOFTHSM_CONF is not set
 if [ -z "${SOFTHSM_CONF}" ]; then
-    if [ -n "${testdir}" ]; then
-        export SOFTHSM_CONF="$(realpath ${testdir}/softhsm.conf)"
-    else
-        echo "ERROR: Neither SOFTHSM_CONF nor testdir set!" 2>&1
-        exit 1
-    fi
+    echo "ERROR: SOFTHSM_CONF not set!" 1>&2
+    exit 1
 else
     export SOFTHSM_CONF
@@ -116 +111 @@
 cert_label="certificate"
 
-# The Apache/SoftHSM configuration mixes up directories, so generate
-# softhsm.conf with an absolute path to the token database if a
-# template is present. Generating it on every run avoids problems if
-# the source tree was moved.
-if [ -e "${SOFTHSM_CONF}.in" ]; then
-    cat "${SOFTHSM_CONF}.in" | sed "s,__DIR__,$(realpath $(dirname ${SOFTHSM_CONF}))," \
-        >"${SOFTHSM_CONF}"
-fi
-
 if [ "${init}" = "true" ]; then
     prepare_token "${token_label}" "${2}" "${3}"