summaryrefslogtreecommitdiff
path: root/test/integration/framework
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-09-04 11:31:36 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-09-14 15:22:17 +0200
commitae7fce5a60397ef3300a533944d7fa91e32ec178 (patch)
tree036dbfa6e0835aa4d4005f93c5c541e75520cc51 /test/integration/framework
parent4a66cdd32dd18c32556068b9da30b33c06eb2df5 (diff)
tests: store msgmsg message for display in fail as well
Git-Dch: Ignore
Diffstat (limited to 'test/integration/framework')
-rw-r--r--test/integration/framework13
1 files changed, 12 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 18bfec7ed..6cba26c8d 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -66,6 +66,9 @@ msgtest() { msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@"; }
msgpass() { printf "${CPASS}PASS${CNORMAL}\n"; }
msgskip() {
if [ -n "$MSGTEST_MSG" ]; then
+ if [ -n "$MSGTEST_MSGMSG" ]; then
+ echo "$MSGTEST_MSGMSG"
+ fi
if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then
echo "Part of the test group: $MSGTEST_GRP"
fi
@@ -77,6 +80,9 @@ msgskip() {
}
msgfail() {
if [ -n "$MSGTEST_MSG" ]; then
+ if [ -n "$MSGTEST_MSGMSG" ]; then
+ echo "$MSGTEST_MSGMSG"
+ fi
if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then
echo "Part of the test group: $MSGTEST_GRP"
fi
@@ -114,7 +120,9 @@ if [ $MSGLEVEL -le 1 ]; then
msgnwarn() { true; }
fi
if [ $MSGLEVEL -le 2 ]; then
- msgmsg() { true; }
+ msgmsg() {
+ MSGTEST_MSGMSG="$(msgprintf "${CMSG}%s" '%s' "${CNORMAL}" "$@")"
+ }
msgnmsg() { true; }
msgtest() {
MSGTEST_MSG="$(msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@")"
@@ -1433,6 +1441,9 @@ testmarkedmanual() {
msgfailoutput() {
if [ -n "$MSGTEST_MSG" ]; then
echo
+ if [ -n "$MSGTEST_MSGMSG" ]; then
+ echo "$MSGTEST_MSGMSG"
+ fi
if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then
echo "${CFAIL}Part of the test group: $MSGTEST_GRP"
fi