From d66839500209d241bcb16de98ec41b03e2aed872 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 6 Jul 2016 19:08:08 +0100
Subject: [PATCH] apparmor-libreoffice: try to use uninstalled files
The more files we use from the $srcdir, the more likely it is that
test fixes can be deployed to LAVA without waiting for a package
rebuild.
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/D3634
---
Makefile | 1 +
apparmor/apparmor-libreoffice.yaml | 2 +-
apparmor/libreoffice/libreoffice | 10 +++++-----
apparmor/libreoffice/test-libreoffice | 3 ++-
debian/apertis-tests.install | 1 +
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 1cd91cc..4e12dd8 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ COPY = \
folks \
grilo \
inherit-config.sh \
+ libreoffice \
misc \
predeployed-misc \
resources \
diff --git a/apparmor/apparmor-libreoffice.yaml b/apparmor/apparmor-libreoffice.yaml
index a3350af..6bf74e8 100644
--- a/apparmor/apparmor-libreoffice.yaml
+++ b/apparmor/apparmor-libreoffice.yaml
@@ -20,7 +20,7 @@ install:
run:
steps:
- echo -n | sudo tee /var/log/audit/audit.log
- - common/run-test-in-systemd --name run-test-libreoffice --timeout 300 /usr/lib/apertis-tests/apparmor/libreoffice/test-libreoffice
+ - common/run-test-in-systemd --name run-test-libreoffice --timeout 300 apparmor/libreoffice/test-libreoffice
- sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
parse:
diff --git a/apparmor/libreoffice/libreoffice b/apparmor/libreoffice/libreoffice
index 9818d65..0795bb8 100755
--- a/apparmor/libreoffice/libreoffice
+++ b/apparmor/libreoffice/libreoffice
@@ -11,19 +11,19 @@ fi
export APERTIS_TESTS_NAME_PREFIX="${1}_"
export DEBUG=2
-here="$(cd "$(dirname "$0")" && pwd)"
+TESTS_DIR="$(cd "$(dirname "$0")" && pwd)"
pkglibdir="$(cd "$(dirname "$0")"/../.. && pwd)"
-if [ -e "$here/libreoffice-malicious-override.so" ]; then
- preload="$here/libreoffice-malicious-override.so"
+if [ -e "$TESTS_DIR/libreoffice-malicious-override.so" ]; then
+ preload="$TESTS_DIR/libreoffice-malicious-override.so"
else
preload="/usr/lib/apertis-tests/apparmor/libreoffice/libreoffice-malicious-override.so"
fi
if [[ $1 == "malicious" ]]; then
LD_PRELOAD="$preload" \
- /usr/share/chaiwala-tests/libreoffice/automated/run-test.sh
+ "$pkglibdir/libreoffice/automated/run-test.sh"
else
- /usr/share/chaiwala-tests/libreoffice/automated/run-test.sh
+ "$pkglibdir/libreoffice/automated/run-test.sh"
fi
diff --git a/apparmor/libreoffice/test-libreoffice b/apparmor/libreoffice/test-libreoffice
index 991b1ad..3981020 100755
--- a/apparmor/libreoffice/test-libreoffice
+++ b/apparmor/libreoffice/test-libreoffice
@@ -1,7 +1,8 @@
#!/bin/bash
# vim: tw=0
-TEST_DIR="${TEST_DIR:-/usr/lib/apertis-tests/apparmor/libreoffice}"
+TEST_DIR="$(cd "$(dirname "$0")" && pwd)"
+
# We don't need a DBUS session
export LAUNCH_DBUS="no"
diff --git a/debian/apertis-tests.install b/debian/apertis-tests.install
index 202b01d..818475a 100644
--- a/debian/apertis-tests.install
+++ b/debian/apertis-tests.install
@@ -14,6 +14,7 @@ usr/lib/apertis-tests/dbus
usr/lib/apertis-tests/grilo
usr/lib/apertis-tests/folks
usr/lib/apertis-tests/inherit-config.sh
+usr/lib/apertis-tests/libreoffice
usr/lib/apertis-tests/misc
usr/lib/apertis-tests/networking/proxy-manual/Makefile
usr/lib/apertis-tests/networking/proxy-manual/README
--
GitLab