From 58608941e6b58a46109b7cd875716b3d8054c4bf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 10 Nov 2016 21:28:12 +0100
Subject: travis: ignore profiling warning in test diffs

On Travis CI running tests with code coverage enabled sometimes
generates lines like:
  profiling:/path/to/file.gcda:Merge mismatch for function 257
It would be nice if we could resolve this somehow as it garbles the
statistics, but until then it is far more annoying that this causes
test failures for no good reason.

Gbp-Dch: Ignore
---
 test/integration/framework | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/integration/framework b/test/integration/framework
index 03633f28a..0222f2bc9 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1394,7 +1394,20 @@ downloadfile() {
 }
 
 checkdiff() {
-	local DIFFTEXT="$(command diff -u "$@" 2>&1 | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
+	local TMPFILE1="${TMPWORKINGDIRECTORY}/rootdir/tmp/checkdiff.1.tmp"
+	local TMPFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/checkdiff.2.tmp"
+	touch "$TMPFILE1" "$TMPFILE2"
+	if [ "$1" != '-' ]; then
+		sed -e '/^profiling:/ d' < "$1" >"$TMPFILE1"
+	else
+		TMPFILE1='-'
+	fi
+	if [ "$2" != '-' ]; then
+		sed -e '/^profiling:/ d' < "$2" >"$TMPFILE2"
+	else
+		TMPFILE2='-'
+	fi
+	local DIFFTEXT="$(command diff -u "$TMPFILE1" "$TMPFILE2" 2>&1 | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
 	if [ -n "$DIFFTEXT" ]; then
 		echo >&2
 		echo >&2 "$DIFFTEXT"
-- 
cgit v1.2.3