summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-11-10 21:28:12 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-11-10 21:28:12 +0100
commit58608941e6b58a46109b7cd875716b3d8054c4bf (patch)
tree03996d723b1328cf73d2381fc836e1df68d7bc10 /test/integration
parentff02180ca8abeec0cc1913abf4ad6697d7b25a36 (diff)
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
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/framework15
1 files changed, 14 insertions, 1 deletions
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"