Browse Source

travis: ignore profiling warning in progress lines

On Travis CI running tests with code coverage enabled sometimes
generates profiling lines, which we filter out for a while now,
but that misses lines generated showing progress still causing test
failures, so more sed logic is added in the hopes to ignore them.

Extends: 58608941e6
Gbp-Dch: Ignore
tags/debian/1.5_alpha1
David Kalnischkies 4 years ago
parent
commit
fc251c8c9e
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      test/integration/framework

+ 2
- 2
test/integration/framework View File

@@ -1428,12 +1428,12 @@ checkdiff() {
local TMPFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/checkdiff.2.tmp"
touch "$TMPFILE1" "$TMPFILE2"
if [ "$1" != '-' ]; then
sed -e '/^profiling:/ d' < "$1" >"$TMPFILE1"
sed -e '/^profiling:/ d' -e '/\.\.\.profiling:/{N;s#\.\.\.profiling:.*\n#...#g}' < "$1" >"$TMPFILE1"
else
TMPFILE1='-'
fi
if [ "$2" != '-' ]; then
sed -e '/^profiling:/ d' < "$2" >"$TMPFILE2"
sed -e '/^profiling:/ d' -e '/\.\.\.profiling:/{N;s#\.\.\.profiling:.*\n#...#g}' < "$2" >"$TMPFILE2"
else
TMPFILE2='-'
fi


Loading…
Cancel
Save