Skip to content

Commit d3282bd

Browse files
[gcov]: Fix directory prefix issue for (sonic-net#2969)
Change the directory prefix used gcov_support.sh to discover gcov-related files.
1 parent 0e8890e commit d3282bd

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

tests/gcov_support.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,15 @@ lcov_merge_all()
125125
fi
126126
done < infolist
127127

128-
lcov --extract total.info '*sonic-gcov/*' -o total.info
129-
130128
# Remove unit test files.
131-
lcov -o total.info -r total.info "*sonic-gcov/common_work/gcov/orchagent/p4orch/tests/*"
132-
lcov -o total.info -r total.info "*sonic-gcov/common_work/gcov/tests/*"
129+
lcov -o total.info -r total.info "*tests/*"
130+
lcov -o total.info -r total.info "/usr/*"
133131

134132
cp $1/lcov_cobertura.py $1/common_work/gcov/
135133
python $1/common_work/gcov/lcov_cobertura.py total.info -o coverage.xml
136134

137-
sed -i "s#common_work/gcov/##" coverage.xml
138-
sed -i "s#common_work.gcov.##" coverage.xml
135+
sed -i "s#../../__w/1/s/##" coverage.xml
136+
sed -i "s#......__w.1.s.##" coverage.xml
139137

140138
cd gcov_output/
141139
if [ ! -d ${ALLMERGE_DIR} ]; then
@@ -385,9 +383,7 @@ main()
385383
echo "Usage:"
386384
echo " collect collect .gcno files based on module"
387385
echo " collect_gcda collect .gcda files"
388-
echo " collect_gcda_files collect .gcda files in a docker"
389386
echo " generate generate gcov report in html form (all or submodule_name)"
390-
echo " tar_output tar gcov_output forder"
391387
echo " merge_container_info merge homonymic info files from different container"
392388
echo " set_environment set environment ready for report generating in containers"
393389
esac

0 commit comments

Comments
 (0)