diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-22 08:42:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-22 08:42:04 -0400 |
| commit | add00045aa56c77b93b1fb4b3cf424588a7baf0e (patch) | |
| tree | 80f1d0fbdfa0dc9b9a500aa111d5dd96849d6a3c | |
| parent | 87a7748a8489160ffce966e663dc1e25de1c734e (diff) | |
| parent | db94d7fed246e617fe953751a8f506f9b57c2fda (diff) | |
| download | tor-add00045aa56c77b93b1fb4b3cf424588a7baf0e.tar.gz tor-add00045aa56c77b93b1fb4b3cf424588a7baf0e.zip | |
Merge branch 'bug26101_26102'
| -rw-r--r-- | changes/bug26101_26102 | 5 | ||||
| -rwxr-xr-x | scripts/test/cov-diff | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changes/bug26101_26102 b/changes/bug26101_26102 new file mode 100644 index 0000000000..bc3bc84b2c --- /dev/null +++ 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 index ed8874d2d3..6179dff63e 100755 --- 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 |