From d1059a936644f1a3c274f97218c7224622f212df Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@torproject.org>
Date: Mon, 15 Jul 2013 22:33:39 -0700
Subject: [PATCH] Add optional target directory parameter to coverage script
 and add reset-gcov target to Makefile.am

---
 Makefile.am      | 3 +++
 changes/bug9267  | 4 ++++
 contrib/coverage | 7 +++++++
 3 files changed, 14 insertions(+)
 create mode 100644 changes/bug9267

diff --git a/Makefile.am b/Makefile.am
index 1bc1077ebb..0361d87cec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,9 @@ test: all
 test-network: all
 	./src/test/test-network.sh
 
+reset-gcov:
+	rm -f src/*/*.gcda
+
 # Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c,
 # eventdns.[hc], tinytest*.[ch]
 check-spaces:
diff --git a/changes/bug9267 b/changes/bug9267
new file mode 100644
index 0000000000..95a621148d
--- /dev/null
+++ b/changes/bug9267
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Added optional parameter to contrib/coverage script to specify directory
+      to put gcov files in, and added reset-gcov target to top-level makefile.
+      Fixes bug #9267.
diff --git a/contrib/coverage b/contrib/coverage
index f51649a78e..8d971660c9 100755
--- a/contrib/coverage
+++ b/contrib/coverage
@@ -5,9 +5,16 @@
 # coverage -- run gcov on the appropriate set of object files to extract
 # coverage information.
 
+dst=$1
+
 for fn in src/or/*.c src/common/*.c; do
     BN=`basename $fn`
     DN=`dirname $fn`
     F=`echo $BN | sed -e 's/\.c$//;'`
+    GC="${BN}.gcov"
     gcov -o $DN/src_*$F.o $fn
+    if [ -n $dst ]
+    then
+      mv $GC $dst/$GC
+    fi
 done