commit add00045aa56c77b93b1fb4b3cf424588a7baf0e parent 87a7748a8489160ffce966e663dc1e25de1c734e Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 22 May 2018 08:42:04 -0400 Merge branch 'bug26101_26102' Diffstat:
| A | changes/bug26101_26102 | | | 6 | ++++++ |
| M | scripts/test/cov-diff | | | 6 | +++--- |
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/changes/bug26101_26102 b/changes/bug26101_26102 @@ -0,0 +1,5 @@ + o Minor bugfixes (test coverage tools): + - Update our "cov-diff" script to handle output from the latest + version of gcov, and to remove extraneous timestamp information + from its output. Fixes bugs 26101 and 26102; bugfix on + 0.2.5.1-alpha. +\ No newline at end of file diff --git a/scripts/test/cov-diff b/scripts/test/cov-diff @@ -10,12 +10,12 @@ DIRB="$2" for B in $DIRB/*; do A=$DIRA/`basename $B` if [ -f $A ]; then - perl -pe 's/^\s*\!*\d+:/ 1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$A" > "$A.tmp" + perl -pe 's/^\s*\!*\d+(\*?):/ 1$1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$A" > "$A.tmp" else cat /dev/null > "$A.tmp" fi - perl -pe 's/^\s*\!*\d+:/ 1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$B" > "$B.tmp" - diff -u "$A.tmp" "$B.tmp" + perl -pe 's/^\s*\!*\d+(\*?):/ 1$1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$B" > "$B.tmp" + diff -u "$A.tmp" "$B.tmp" |perl -pe 's/^((?:\+\+\+|---)(?:.*tmp))\s+.*/$1/;' rm "$A.tmp" "$B.tmp" done