diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-06-27 15:54:10 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-06-28 20:15:47 +0200 |
| commit | ed3cec01a1ee10b608eae3d253645a5376f6c400 (patch) | |
| tree | b249dbb5af9444737e5e86d4d6052af85f97c021 /test/integration | |
| parent | 1c562dbf59430283953c18ab896acaa5c67fd16b (diff) | |
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: 58608941e6b58a46109b7cd875716b3d8054c4bf
Gbp-Dch: Ignore
(cherry picked from commit fc251c8c9e2a76ab5c350900e9e032830c81e2b3)
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework index c65ac5acb..a424f1559 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -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 |