From a7d1fcc935e77ddae6aad599d78cee487f9f4517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Fri, 23 Nov 2018 19:58:49 +0100 Subject: tests/scripts/common.sh: Add check_if_equal() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tim Rühsen --- tests/scripts/common.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh index fcad3d7af0..adc69b3062 100644 --- a/tests/scripts/common.sh +++ b/tests/scripts/common.sh @@ -262,4 +262,21 @@ terminate_proc() { done kill_quiet -9 $pid sleep 0.1 + +# $1, $2: the two files to check for equality +# $3: Strings to be ignored, separated by | +check_if_equal() { + if test -n "$3"; then + local tmp1=`basename "$1"`"1.tmp" + local tmp2=`basename "$2"`"2.tmp" + egrep -v "$3" "$1" | tr -d '\r' >"$tmp1" + egrep -v "$3" "$2" | tr -d '\r' >"$tmp2" + diff -b -B "$tmp1" "$tmp2" + local rc=$? + rm -f "$tmp1" "$tmp2" + return $rc + fi + + diff -b -B "$1" "$2" + return $? } -- cgit v1.2.1