tests: set SOCKET_WRAPPER_DIR_ALLOW_ORIG

This allows the sockwrap library to use the original relative path of its
directory, instead of failing when realpath() gives an absolute pathname
which is too long. This was causing the COPR builds to fail on newer
versions of Fedora (with newer sockwrap).

Closes: #770
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 907652726286f63ed567b11ff976172761f927f3..823928d9bb933c86c47aa813bae333c288c8ebfa 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -299,6 +299,7 @@ $(certsdir)/ca.pem: | $(certsdir)/ca-key.pem
 
 SWTPM_TMPDIR := $(shell echo swtpm.$$$$.tmp)
 SWTPM_PRELOAD := LD_PRELOAD=libsocket_wrapper.so SOCKET_WRAPPER_DIR=$(SWTPM_TMPDIR) \
+       SOCKET_WRAPPER_DIR_ALLOW_ORIG=1 \
        TPM_INTERFACE_TYPE=socsim TPM2TSSENGINE_TCTI=swtpm
 
 SWTPM_IOCTL_RUN = $(SWTPM_PRELOAD) $(SWTPM_IOCTL) --tcp 127.0.0.1:2322

diff --git a/tests/common.sh b/tests/common.sh
index 7313d3a047f4f96668248a20407eb6e99eca591f..6fed8b4576bba4670f08fe232b624a2f8cafe35e 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -36,6 +36,7 @@ test $(id -u) -eq 0 && SUDO= || SUDO=sudo
 top_builddir=${top_builddir:-..}
 SOCKDIR="./sockwrap.$$.tmp"
 mkdir -p $SOCKDIR
+export SOCKER_WRAPPER_DIR_ALLOW_ORIG=1
 export SOCKET_WRAPPER_DIR=$SOCKDIR
 export SOCKET_WRAPPER_DEFAULT_IFACE=2
 ADDRESS=127.0.0.$SOCKET_WRAPPER_DEFAULT_IFACE