[tor-commits] [tor/release-0.4.0] Merge branch 'ticket29435_035' into ticket29435_040

[dgoulet at torproject.org]

commit f2b646a2b6111763f30d6d5193340044a0b29b01
Merge: 7f59b9fb1 192b312c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 8 10:47:04 2019 -0500

    Merge branch 'ticket29435_035' into ticket29435_040

 changes/ticket29435   | 3 +++
 scripts/test/coverage | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc scripts/test/coverage
index 7a417cdc8,b6e17abe2..f61c83bc7
--- a/scripts/test/coverage
+++ b/scripts/test/coverage
@@@ -8,13 -8,13 +8,13 @@@
  dst=$1
  
  for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do
 -    BN=`basename $fn`
 -    DN=`dirname $fn`
 -    F=`echo $BN | sed -e 's/\.c$//;'`
 +    BN=$(basename "$fn")
 +    DN=$(dirname "$fn")
 +    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