diff --git a/apparmor/apparmor-pulseaudio.yaml b/apparmor/apparmor-pulseaudio.yaml index 51bdc760d9d97b032fc25a35d3c20f0b356ff421..31b4afaa263b8def7a2dbe49db903cf3188ab5c1 100644 --- a/apparmor/apparmor-pulseaudio.yaml +++ b/apparmor/apparmor-pulseaudio.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-pulseaudio --timeout 90 /usr/lib/apertis-tests/apparmor/pulseaudio/test-pulseaudio + - common/run-test-in-systemd --name run-test-pulseaudio --timeout 90 apparmor/pulseaudio/test-pulseaudio - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING parse: diff --git a/apparmor/pulseaudio/pulseaudio b/apparmor/pulseaudio/pulseaudio index 956635d4dd8fc4ce8620892b45912eaa52a73cb4..01319f43b0ad9d16807ff4442be71297219b9c09 100755 --- a/apparmor/pulseaudio/pulseaudio +++ b/apparmor/pulseaudio/pulseaudio @@ -1,8 +1,7 @@ #!/bin/bash # vim: set sts=4 sw=4 et tw=0 : -# Default value. Can be overriden by setting it in the env. -: ${RESOURCE_DIR:="/usr/share/chaiwala-tests/resources/media"} +pkglibdir="$(cd "$(dirname "$0")/../.." && pwd)" if [[ ${#@} -eq 1 ]] && [[ $1 =~ (normal|malicious) ]]; then : @@ -19,7 +18,7 @@ test_pulseaudio() { echo ">> 2" pactl set-sink-volume 0 0 echo ">> 3" - paplay "${RESOURCE_DIR}/audio/generic.wav" + paplay "$pkglibdir/resources/media/audio/generic.wav" echo ">> 4" pactl set-sink-volume 0 50% echo ">> 5" diff --git a/apparmor/pulseaudio/test-pulseaudio b/apparmor/pulseaudio/test-pulseaudio index 0ea0ed9ac47ca47145844bd2b432c03d9dba0120..c9a3f7df121e74d42940ca378acb101c7a79c0c3 100755 --- a/apparmor/pulseaudio/test-pulseaudio +++ b/apparmor/pulseaudio/test-pulseaudio @@ -1,7 +1,7 @@ #!/bin/bash # vim: tw=0 -TEST_DIR="${TEST_DIR:-/usr/lib/apertis-tests/apparmor/pulseaudio}" +TEST_DIR="$(cd "$(dirname "$0")" && pwd)" # We want to use the pre-existing session bus. export LAUNCH_DBUS="no" diff --git a/debian/control b/debian/control index 5a8b2e7acf48487b26efd67bce45d7f8390d345e..7461b2cfd6f8c5c82948a0eabec345cd0e532255 100644 --- a/debian/control +++ b/debian/control @@ -273,7 +273,6 @@ Depends: apparmor (>= 2.8.0-0ubuntu5co4), apparmor-profiles, chaiwala-apparmor-profiles, - chaiwala-tests, pulseaudio-utils, Description: Functional tests for PulseAudio AppArmor profiles/abstractions This package tests Apertis AppArmor profiles for PulseAudio.