From 6d77b453b041228d912d4952a4e04c41feec95d1 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Tue, 7 Jan 2025 13:20:13 +0000 Subject: [PATCH] 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 --- tests/Makefile.am | 1 + tests/common.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 90765272..823928d9 100644 --- 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 7313d3a0..6fed8b45 100644 --- 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 -- 2.50.1