From 176989169266253b6598029838bf610313b23db8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 22 Jun 2016 18:23:13 +0100
Subject: [PATCH] apparmor-tumbler: use set -e
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Debian Policy §10.4 says "Every script should use set -e or check
the exit status of every command", which is just generally good
advice.
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D3478
---
apparmor/tumbler/test-tumbler | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/apparmor/tumbler/test-tumbler b/apparmor/tumbler/test-tumbler
index 84df897..92ea813 100755
--- a/apparmor/tumbler/test-tumbler
+++ b/apparmor/tumbler/test-tumbler
@@ -1,9 +1,15 @@
#!/bin/bash
# vim: tw=0
+set -e
+
TEST_DIR=$(cd $(dirname $0); pwd; cd - &>/dev/null)
# We want to use the pre-existing session bus.
export LAUNCH_DBUS="no"
-"${TEST_DIR}"/run-aa-test "${TEST_DIR}"/tumbler.normal.expected "${TEST_DIR}"/tumbler normal
-"${TEST_DIR}"/run-aa-test "${TEST_DIR}"/tumbler.malicious.expected "${TEST_DIR}"/tumbler malicious
+exit_status=0
+
+"${TEST_DIR}"/run-aa-test "${TEST_DIR}"/tumbler.normal.expected "${TEST_DIR}"/tumbler normal || exit_status=$?
+"${TEST_DIR}"/run-aa-test "${TEST_DIR}"/tumbler.malicious.expected "${TEST_DIR}"/tumbler malicious || exit_status=$?
+
+exit "$exit_status"
--
GitLab