Commit 7e703a59 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Add install support for lcov 



This is targeted mainly for centos7 where newer devtoolset is meant
to be used and with which the shipped version of lcov is not
compatible.

Considering the above, don't add lcov to the default installation
list, keep it on-demand.

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: I8022770d301dc778317f6ada215c31877d058fbd
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9513


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMonica Kenguva <monica.kenguva@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent e08096ac

test/common/config/pkgdep/git

+11 −0
Original line number Diff line number Diff line
@@ -489,6 +489,14 @@ function install_ice() { 
	)

}



function install_lcov() {

	local lcov_version=v1.15



	rm -rf /usr/src/lcov

	sudo git clone "$GIT_REPO_LCOV" --branch "$lcov_version" /usr/src/lcov

	(cd /usr/src/lcov; sudo make install)

}



function install_sources() {

	if [[ $ID == centos ]] && (( VERSION_ID == 7 )); then

		# install proper version of the git first
@@ -514,6 +522,7 @@ function install_sources() { 
			install_qemu

			install_igb_uio

			install_ice

			install_lcov

		)

		install_extra_pkgs

	fi
@@ -576,6 +585,8 @@ export GIT_REPO_DPDK_KMODS 
export IRDMA_DRIVER

: ${ICE_DRIVER="https://sourceforge.net/projects/e1000/files/ice stable/$ICE_VERSION/ice-$ICE_VERSION.tar.gz"}

export ICE_DRIVER

: ${GIT_REPO_LCOV=https://github.com/linux-test-project/lcov}

export GIT_REPO_LCOV

GIT_REPOS=${GIT_REPOS:-$HOME}



gcc_version=$(gcc -dumpversion) gcc_version=${gcc_version%%.*}

test/common/config/vm_setup.sh

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ function usage() { 
	echo "  -h --help"

	echo "  -u --upgrade Run $package_manager upgrade"

	echo "  -i --install-deps Install $package_manager based dependencies"

	echo "  -t --test-conf List of test configurations to enable (${CONF},irdma)"

	echo "  -t --test-conf List of test configurations to enable (${CONF},irdma,lcov)"

	echo "  -c --conf-path Path to configuration file"

	echo "  -d --dir-git Path to where git sources should be saved"

	echo "  -s --disable-tsocks Disable use of tsocks"