From f74a6fa120759d0a1bd4a5aff0dc2c50911b5407 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 15 Jan 2014 18:44:47 +0100
Subject: rework some testcases to not spit out text

Rework also uncovers two FIXMEs

Git-Dch: Ignore
---
 test/integration/framework | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index 6ada1e9cc..2fe059280 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -948,22 +948,22 @@ testempty() {
 	test -z "$($* 2>&1)" && msgpass || msgfail
 }
 
-testequalwithmsg() {
-        local MSG="$1"
-        shift
+testequal() {
+	local MSG='Test of equality of'
+	if [ "$1" = '--nomsg' ]; then
+		MSG=''
+		shift
+	fi
+
 	local COMPAREFILE=$(mktemp)
 	addtrap "rm $COMPAREFILE;"
 	echo "$1" > $COMPAREFILE
 	shift
-	msgtest "$MSG"
-	$* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
-}        
 
-testequal() { 
-       local EXPECTED="$1"
-       shift
-       local MSG="Test for equality of $*"
-       testequalwithmsg "$MSG" "$EXPECTED" $*
+	if [ -n "$MSG" ]; then
+		msgtest "$MSG" "$*"
+	fi
+	$* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }
 
 testequalor2() {
-- 
cgit v1.2.3