mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-25 07:07:52 +01:00
Merge remote-tracking branch 'tor-github/pr/518'
This commit is contained in:
commit
26539ec3ae
2 changed files with 13 additions and 10 deletions
3
changes/ticket28008
Normal file
3
changes/ticket28008
Normal file
|
@ -0,0 +1,3 @@
|
|||
o Code simplification and refactoring:
|
||||
- Fix shellcheck warnings in scripts/test/coverage. Resolves issue
|
||||
28008.
|
|
@ -8,30 +8,30 @@
|
|||
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=$(echo "${DN}"/src_*-"${F}".o)
|
||||
ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o"
|
||||
# If the wildcard didn't expand, no files
|
||||
if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ]
|
||||
then
|
||||
for on in $ONS; do
|
||||
# We should have a gcno file
|
||||
GCNO=`echo $on | sed -e 's/\.o$/\.gcno/;'`
|
||||
if [ -e $GCNO ]
|
||||
GCNO=$(echo "$on" | sed -e 's/\.o$/\.gcno/;')
|
||||
if [ -e "$GCNO" ]
|
||||
then
|
||||
# No need to test for gcda, since gcov assumes no execution
|
||||
# if it's absent
|
||||
rm -f $GC
|
||||
gcov -o $on $fn
|
||||
if [ -e $GC ]
|
||||
rm -f "$GC"
|
||||
gcov -o "$on" "$fn"
|
||||
if [ -e "$GC" ]
|
||||
then
|
||||
if [ -d "$dst" ]
|
||||
then
|
||||
mv $GC $dst/$GC
|
||||
mv "$GC" "$dst"/"$GC"
|
||||
fi
|
||||
else
|
||||
echo "gcov -o $on $fn didn't make a .gcov file"
|
||||
|
|
Loading…
Add table
Reference in a new issue