From 6a007ac5ddf570d0ee02b33d0c8622ea3c2ffd36 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 30 May 2017 16:03:30 +0100
Subject: [PATCH] apparmor/automated: Move test profiles to this subdirectory
This keeps everything more self-contained.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Emanuele Aina <emanuele.aina@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D6918
---
apparmor/automated/run-test.sh | 5 ++---
.../automated}/test-profiles/usr.lib.invalid-profile | 0
.../automated}/test-profiles/usr.lib.valid-profile | 0
debian/copyright | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
rename {resources/apparmor => apparmor/automated}/test-profiles/usr.lib.invalid-profile (100%)
rename {resources/apparmor => apparmor/automated}/test-profiles/usr.lib.valid-profile (100%)
diff --git a/apparmor/automated/run-test.sh b/apparmor/automated/run-test.sh
index eaf4b90d..dbd8e2d7 100755
--- a/apparmor/automated/run-test.sh
+++ b/apparmor/automated/run-test.sh
@@ -26,7 +26,6 @@ APPARMOR_PROFILES_DIRS=(
"/etc/apparmor.d/local"
"/etc/apparmor.d/tunables")
AUDIT_LOG="/var/log/audit/audit.log"
-RESOURCE_DIR="$(cd "${TESTDIR}/../../resources" && pwd)"
#########
# Setup #
@@ -80,12 +79,12 @@ test_apparmor_enabled() {
# Check if profiles are being parsed correctly
test_profile_parsing() {
local ret=0
- if ! /sbin/apparmor_parser -Q "${RESOURCE_DIR}/apparmor/test-profiles/usr.lib.valid-profile"; then
+ if ! /sbin/apparmor_parser -Q "${TESTDIR}/test-profiles/usr.lib.valid-profile"; then
whine "Failed to parse a valid profile!"
ret=1
fi
- if /sbin/apparmor_parser -Q "${RESOURCE_DIR}/apparmor/test-profiles/usr.lib.invalid-profile"; then
+ if /sbin/apparmor_parser -Q "${TESTDIR}/test-profiles/usr.lib.invalid-profile"; then
whine "Successfully parsed an invalid profile!"
ret=1
fi
diff --git a/resources/apparmor/test-profiles/usr.lib.invalid-profile b/apparmor/automated/test-profiles/usr.lib.invalid-profile
similarity index 100%
rename from resources/apparmor/test-profiles/usr.lib.invalid-profile
rename to apparmor/automated/test-profiles/usr.lib.invalid-profile
diff --git a/resources/apparmor/test-profiles/usr.lib.valid-profile b/apparmor/automated/test-profiles/usr.lib.valid-profile
similarity index 100%
rename from resources/apparmor/test-profiles/usr.lib.valid-profile
rename to apparmor/automated/test-profiles/usr.lib.valid-profile
diff --git a/debian/copyright b/debian/copyright
index a3ce2214..13b9ac77 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,10 @@ Copyright:
License: MPL-2.0
Files:
+ apparmor/automated/test-profiles/*
apparmor/goals/*
apparmor/gstreamer1.0/mkprofile.pl
usr/bin/aa_log_extract_tokens.pl
- resources/apparmor/test-profiles/*
Copyright:
© 2006 Novell, Inc.
© 1998-2007 Novell/SuSE/Immunix
--
GitLab