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

This commit is contained in:
David Goulet 2019-02-26 10:46:52 -05:00
commit 1216f99534
2 changed files with 5 additions and 2 deletions

3
changes/ticket29435 Normal file
View File

@ -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.

View File

@ -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