Commit 1216f995 authored by David Goulet's avatar David Goulet 🐼
Browse files

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

parents 955ca72f 192b312c

changes/ticket29435

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

scripts/test/coverage

+2 −2
Original line number Diff line number Diff line
@@ -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