From 6fba6ff4488823d8d6bb03dbfebe1e6cc75489ac Mon Sep 17 00:00:00 2001 From: paul luse Date: Mon, 8 May 2017 13:57:23 -0700 Subject: [PATCH] unittests: add local UT coverage Collect coverage info when running UT locally when lcov is available. Change-Id: I34a8b60056775a25cd4a3906d59c4a42e7cc845f Signed-off-by: paul luse --- .gitignore | 2 ++ autotest.sh | 4 +++- unittest.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 38905b0e2..b7d5fe968 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ *.pyc *.so *.swp +*.DS_Store +ut_coverage/ tags cscope.out dpdk-* diff --git a/autotest.sh b/autotest.sh index 175c316b9..e475c1aac 100755 --- a/autotest.sh +++ b/autotest.sh @@ -25,6 +25,8 @@ out=$PWD cd $src if hash lcov; then + # setup output dir for unittest.sh + export UT_COVERAGE=$out/ut_coverage export LCOV_OPTS=" --rc lcov_branch_coverage=1 --rc lcov_function_coverage=1 @@ -180,6 +182,6 @@ if hash lcov; then # generate coverage data and combine with baseline $LCOV -q -c -d $src -t "$(hostname)" -o cov_test.info $LCOV -q -a cov_base.info -a cov_test.info -o $out/cov_total.info - find . -name "*.gcda" -delete + git clean -f "*.gcda" rm -f cov_base.info cov_test.info fi diff --git a/unittest.sh b/unittest.sh index 81b27227b..4886730d5 100755 --- a/unittest.sh +++ b/unittest.sh @@ -5,6 +5,31 @@ set -xe +# setup local unit test coverage if cov is available +if hash lcov && grep -q '#define SPDK_CONFIG_COVERAGE 1' config.h; then + cov_avail="yes" +else + cov_avail="no" +fi +if [ "$cov_avail" = "yes" ]; then + # set unit test output dir if not specified in env var + if [ -z ${UT_COVERAGE+x} ]; then + UT_COVERAGE="ut_coverage" + fi + mkdir -p $UT_COVERAGE + export LCOV_OPTS=" + --rc lcov_branch_coverage=1 + --rc lcov_function_coverage=1 + --rc genhtml_branch_coverage=1 + --rc genhtml_function_coverage=1 + --rc genhtml_legend=1 + --rc geninfo_all_blocks=1 + " + export LCOV="lcov $LCOV_OPTS --no-external" + # zero out coverage data + $LCOV -q -c -i -d . -t "Baseline" -o $UT_COVERAGE/ut_cov_base.info +fi + $valgrind test/lib/blob/blob_ut/blob_ut $valgrind test/lib/blobfs/blobfs_async_ut/blobfs_async_ut @@ -52,6 +77,16 @@ $valgrind test/lib/util/bit_array/bit_array_ut $valgrind test/lib/util/io_channel/io_channel_ut $valgrind test/lib/util/string/string_ut +# local unit test coverage +if [ "$cov_avail" = "yes" ]; then + $LCOV -q -d . -c -t "$(hostname)" -o $UT_COVERAGE/ut_cov_test.info + $LCOV -q -a $UT_COVERAGE/ut_cov_base.info -a $UT_COVERAGE/ut_cov_test.info -o $UT_COVERAGE/ut_cov_total.info + $LCOV -q -a $UT_COVERAGE/ut_cov_total.info -o $UT_COVERAGE/ut_cov_unit.info + rm -f $UT_COVERAGE/ut_cov_base.info $UT_COVERAGE/ut_cov_test.info + genhtml $UT_COVERAGE/ut_cov_unit.info --output-directory $UT_COVERAGE + git clean -f "*.gcda" +fi + set +x echo @@ -59,5 +94,10 @@ echo echo "=====================" echo "All unit tests passed" echo "=====================" +if [ "$cov_avail" = "yes" ]; then + echo "Note: coverage report is here: ./$UT_COVERAGE" +else + echo "WARN: lcov not installed or SPDK built without coverage!" +fi echo echo