Commit 5bba1951 authored by Jim Harris's avatar Jim Harris Committed by Konrad Sztyber
Browse files

scripts: always use packaged lcov 



Now that all of the scripts and code have been updated to support
both lcov 1.15 and 2.0, don't pull lcov 1.15 from source - just always
use packaged lcov.

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


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent 6468abf0

test/common/config/pkgdep/git

+0 −17
Original line number Diff line number Diff line
@@ -409,20 +409,6 @@ function install_ice() { 
	)

}



function install_lcov() {

	local lcov_version=v1.15 make=make



	if [[ $OSID != freebsd ]]; then

		install perl-IO-Compress || install perl-modules

	else

		make=gmake

	fi



	rm -rf /usr/src/lcov

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

	(cd /usr/src/lcov; "$make" install)

}



function install_libbpf() {

	local libbpf_version=v1.4.5
@@ -537,7 +523,6 @@ function install_sources() { 
	fi

	sources+=(install_fio)

	sources+=(install_flamegraph)

	sources+=(install_lcov)

	sources+=(install_vagrant)

	sources+=(install_ittapi)
@@ -582,8 +567,6 @@ export GIT_REPO_DPDK_KMODS 
export IRDMA_DRIVER

: ${ICE_DRIVER="https://sourceforge.net/projects/e1000/files/ice%20stable/$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_REPO_BCC=https://github.com/iovisor/bcc.git}

export GIT_REPO_BCC

: ${GIT_REPO_BPFTRACE=https://github.com/iovisor/bpftrace.git}