[tor-commits] [tor/release-0.4.0] Fix coverage script.

[dgoulet at torproject.org]

commit 192b312c977974680516e699c187d285f74ee8e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 8 10:43:38 2019 -0500

    Fix coverage script.
    
    It was looking for object files made with the old automake
    directorations, but those changed when we split up our libraries.
    
    Fixes bug 29435; bugfix on 0.3.5.1-alpha.
---
 changes/ticket29435   | 3 +++
 scripts/test/coverage | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket29435 b/changes/ticket29435
new file mode 100644
index 000000000..d48ae98e4
--- /dev/null
+++ 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
index 59d468ee1..b6e17abe2 100755
--- 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