tor

commit 1216f99534319f4739cd6b90f7aa3633191c2179
parent 955ca72f956f2747809def40b99b87b5647ee8ce
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 26 Feb 2019 10:46:52 -0500

Merge branch 'tor-github/pr/691' into maint-0.3.5

Diffstat:
A
changes/ticket29435
 | 
3
+++
M
scripts/test/coverage
 | 
4
++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/ticket29435 b/changes/ticket29435
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+    - Fix our gcov wrapper script to look for object files at the
+      correct locations. Fixes bug 29435; bugfix on 0.3.5.1-alpha.
diff --git a/scripts/test/coverage b/scripts/test/coverage
@@ -13,8 +13,8 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do
     F=`echo $BN | sed -e 's/\.c$//;'`
     GC="${BN}.gcov"
     # Figure out the object file names
-    ONS=`echo ${DN}/src_*-${F}.o`
-    ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o"
+    ONS=$(echo "${DN}"/*testing_a-"${F}".o)
+    ONS_WILDCARD_LITERAL="${DN}/*testing_a-${F}.o"
     # If the wildcard didn't expand, no files
     if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ]
     then