merge patches from daniel to fix merge artifact and test failure

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index cdaa20627edaf12e89413738ac0b64857f97f395..4a70573c89eeafca8e75159b05e7c32e26eb2d7a 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1,6 +1,6 @@
 #!/bin/sh -- # no runable script, just for vi
 
-TESTFAILURES=0
+EXIT_CODE=0
 
 # we all like colorful messages
 if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \
@@ -38,7 +38,7 @@ msgtest() {
 }
 msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; }
 msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }
-msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; TESTFAILURES=$((TESTFAILURES+1)); }
+msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
 
 # enable / disable Debugging
 MSGLEVEL=${MSGLEVEL:-3}
@@ -118,10 +118,10 @@ gdb() {
 exitwithstatus() {
         # error if we about to overflow, but ...
         #   "255 failures ought to be enough for everybody"
-        if [ $TESTFAILURES -gt 255 ]; then
-            msgdie "Total failure count $TESTFAILURES too big"
+        if [ $EXIT_CODE -gt 255 ]; then
+            msgdie "Total failure count $EXIT_CODE too big"
         fi
-        exit $((TESTFAILURES <= 255 ? TESTFAILURES : 255));
+        exit $((EXIT_CODE <= 255 ? EXIT_CODE : 255));
 }
 
 addtrap() {