From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 12 Aug 2013 13:51:42 +0000 (+0200)
Subject: ensure that testcases exiting because of set -e aren't successful
X-Git-Tag: 0.9.10~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/804d4a0d92a2e107aad38198ac08f1d2d64b5e53

ensure that testcases exiting because of set -e aren't successful

Git-Dch: Ignore
---

diff --git a/test/integration/framework b/test/integration/framework
index 005e31bd3..72c899e32 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -131,13 +131,23 @@ exitwithstatus() {
         exit $((EXIT_CODE <= 255 ? EXIT_CODE : 255));
 }
 
+shellsetedetector() {
+	local exit_status=$?
+	if [ "$exit_status" != '0' ]; then
+		echo >&2 "${CERROR}E: Looks like the testcases ended prematurely with exitcode: ${exit_status}${CNORMAL}"
+		if [ "$EXIT_CODE" = '0' ]; then
+			EXIT_CODE="$exit_status"
+		fi
+	fi
+}
+
 addtrap() {
 	if [ "$1" = 'prefix' ]; then
 		CURRENTTRAP="$2 $CURRENTTRAP"
 	else
 		CURRENTTRAP="$CURRENTTRAP $1"
 	fi
-	trap "$CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+	trap "shellsetedetector; $CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 }
 
 setupenvironment() {