Commit 1ebcd2fd authored by Jim Harris's avatar Jim Harris Committed by Konrad Sztyber
Browse files

test: move LCOV and LCOV_OPTS definitions to autotest_common.sh 



This avoids defining them in multiple places.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I978fbd4f1c0da935eddb2b64872dae20e5f6fc11
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24838


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 1ddf03f6

autotest.sh

+0 −10
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ freebsd_update_contigmem_mod 
freebsd_set_maxsock_buf



if [[ $CONFIG_COVERAGE == y ]]; then

	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

		$lcov_opt

		"

	export LCOV="lcov $LCOV_OPTS --no-external"

	# Print lcov version to log

	$LCOV --version

	# zero out coverage data

test/common/autotest_common.sh

+13 −0
Original line number Diff line number Diff line
@@ -1676,3 +1676,16 @@ if $SPDK_AUTOTEST_X; then 
else

	xtrace_disable

fi



if [[ $CONFIG_COVERAGE == y ]]; then

	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

		$lcov_opt

		"

	export LCOV="lcov $LCOV_OPTS --no-external"

fi

test/unit/unittest.sh

+0 −10
Original line number Diff line number Diff line
@@ -180,16 +180,6 @@ fi 
if [[ $CONFIG_COVERAGE == y ]]; then

	UT_COVERAGE=$output_dir/ut_coverage

	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

		$lcov_opt

		"

	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