From 1d6914c56191c878f2e5c0763a4426742709a498 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 6 Jul 2016 18:59:05 +0100
Subject: [PATCH] apparmor-libreoffice: try to get the preloaded module from
$(dirname $0)
This makes it easier to use uninstalled with
make -C apparmor/libreoffice
apparmor/libreoffice/libreoffice normal
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D3633
---
apparmor/libreoffice/libreoffice | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/apparmor/libreoffice/libreoffice b/apparmor/libreoffice/libreoffice
index e795389..9818d65 100755
--- a/apparmor/libreoffice/libreoffice
+++ b/apparmor/libreoffice/libreoffice
@@ -11,8 +11,17 @@ fi
export APERTIS_TESTS_NAME_PREFIX="${1}_"
export DEBUG=2
+here="$(cd "$(dirname "$0")" && pwd)"
+pkglibdir="$(cd "$(dirname "$0")"/../.. && pwd)"
+
+if [ -e "$here/libreoffice-malicious-override.so" ]; then
+ preload="$here/libreoffice-malicious-override.so"
+else
+ preload="/usr/lib/apertis-tests/apparmor/libreoffice/libreoffice-malicious-override.so"
+fi
+
if [[ $1 == "malicious" ]]; then
- LD_PRELOAD="/usr/lib/apertis-tests/apparmor/libreoffice/libreoffice-malicious-override.so" \
+ LD_PRELOAD="$preload" \
/usr/share/chaiwala-tests/libreoffice/automated/run-test.sh
else
/usr/share/chaiwala-tests/libreoffice/automated/run-test.sh
--
GitLab